Refactor query property watching


Query property changes should only trigger reloads when the query hasn't been switched simultaneously