activities search

A partial develope of function search
conflict resolved