additional search functionality added
fixed merge conflicts with core data model