even nicer searching (remove old code and the search button) makes it neater