Removed default queries in controller init