Separate query types more logically.