Added region search in addition to radius search