working on #81 in Search handler