Refactor & Added Radius to search