Corrected handling of controls list numbers and N/A in Section mapping buttons