extra filters and cleanups for 1.0.9