Moving Filter to a more logical place