adding boundary-based queries instead of circular