added new search features
merge fixed