enable search interface
fix merge conflict in app