ISSUE #30 - Update to partially fix authorization and add serach capability