Move other queries into query files