filtering bugs fixed