Fixed some stuff with the search