Prevent warning thrown from menu widget
Refactor search internals, add sort option for search:results widget