Full selector functionality except for only_map_data now given to the radius search. Also cleaned up some of the code.