Fixes in layout + fixed sorting of filtered results