Controller: more changes for query mode