Added partially working search functionality