Fix filtering regression
Created by: myronmarston
This is the same fix as #1894 but for master. It's a bit more complicated because we now have id filters in addition to location filters to worry about.
/cc @JonRowe
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Created by: myronmarston
This is the same fix as #1894 but for master. It's a bit more complicated because we now have id filters in addition to location filters to worry about.
/cc @JonRowe