FIX: Badge sort and pagination