Fix spurious fields on collection pages

Fixes issues with too many or too few fields being shown.