Improved controller query behavior