Reworked the order of operations for the search and the selector methods. Should be slightly faster and work with the radius search soon.