Also regularizes some of the other selection filtering options. This also fixes an invalidated iterator (and subsequent segfault) in the old code. Fixes https://gitlab.com/kicad/code/kicad/issues/9896