Looks like we still have the issue with the filtersByType Map not being cleared out if all the filters for a given entity type name are no longer required.