Change filters to be setup directly rather than referenced