More search functionality implemented