refactor-part
location-search
activity
Included search changes