Fixes #2554 - Adds search support for sorting and order
Merge pull request #482 from Srokap/ticket_2554

Fixes #2554 - Adds search support for sorting and order