Made some tweaks to the querying to make things even better and not as blinky.