Refactored
Added query handler instead of call_user_*
Merge branch 'master' of http://github.com/samsonos/cms_search