SC4G #41: Adjust filters to work with fields added dynamically from volunteer forms