Generic search functionality has been added