filter fix + client-side sort