Optimized filter/sort functionality and added missing labels