Added search - still not working though