refactoring for global filters. 

Signed-off-by: Matt Barba <matt@placester.com>
Merge branch 'staging' of github.com:Placester/builder into staging