Fix trailing comma when user only has city OR country set