Fix distribution filtering by category bug and refactor for performance (#4590)

Fix distribution filtering by category bug and refactor for performance (#4590) #7740