Fix filtering regression
Created by: myronmarston
Repeat of #1895 so that hopefully travis will build it.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Created by: myronmarston
Repeat of #1895 so that hopefully travis will build it.