search by activity tag
merge stuff
search merge fix