working on search feature
fixed merge issues