Fixed controller and query manager