fix search bar
update todo, remove old code