search engine mgmt + query data fixes