Followup of Rouslan's recent commit - form field selection should never be based...