added some basic and combined search functionality