Added additional autopicker controls