This will make the internal state better to track and avoids the need to
have a wrapper around the queryFinished signal in the wrapper.