improve search, move search to app