Remove *g for geo-mandatory fields, remove blank option from license field