Finalised search
Fixed the search feature.