Filter's already been implemented in cb20175