Fix Distribution#new,#create,#edit to only show active items (#4848)

Fix Distribution#new,#create,#edit to only show active items (#4848) #7954