Add contentFilters and improve the heuristics