refractoring
refractored search view
added file
merge conflict