FIX: Badge page filtering and sort