final search refactor for today