fix order for common name inputs #2354