added logic check for no comma after city