Fix for filters on groups and nested elements