The general selectors previously used here matched either form. With this change, they will only match the form for which the selection was actually made.