Move custom queries into a defaultdict
add an area query