implemented search functionality on the orders page
merge changes