Re-added filters and re-organized code placement in said filters