Added crude search functionality