Added searchHandler
Added Order to search
Added changes from Dennis