cleaned up the search part, starting to look good