More filtering cleanup#945

h-m-m wants to merge 2 commits intomainrubyforgood/mutual-aid:mainfrom

hmm/more-filtering-cleanuprubyforgood/mutual-aid:hmm/more-filtering-cleanupCopy head branch name to clipboard