SUP-769 #comment function instead of repeating code in applyFilterFields