Started fixing the search feature