Rework search to use angular