Added support for ExcludeFilters
Minor code cleanup