Partially revert 7073230 to fix filter row