Update search functionality anf resolved issue #17