Add sort/order to search (although layout is still crap)