RM

added more search capabilities