Replace autocomplete inputs with select boxes [MJ-171]