NEXUS-5753: Skimmed more the filter.