working on search
merge