Data filtering: Fixes for 21581, 21585