Rework search by term UI