Jeremy Patrick: Added search parameters, distance fields