Adds search for activity
merge conflicts