some local changes in queryController