Bug fixes in TC filtering