Updating auto fill to not choose a null option