Remote branch autofill corrected. Closes #1209, #2001.