Removed filterActive from filter alerts
Merge branch 'master' into production