Made area_query and coord_query ready for attic.