Multiple versions, labeled and not, are always good for RPGs. As for what is needed on a city map, I've learned that it's very dependent on the players. But if I'm not sure what the PCs need or how the players will act, I follow a few rules of thumb. For a large city, I usually break it down by neighborhood or district so the players have an idea of what they might find in a certain area. For instance, I usually have a Scholar's District so that the PCs can track down certain books or talk to people who can give them key bits of information (this is usually where the mages live, too). I always have a Market District so the PCs can re-supply or purchase specialty items and an Artisan's District (or Craftsmen's District) so they can have repairs done to their belongings. I have a Royal District or Noble District or Administrative District where the fancy people live and run the town, city, or perhaps kingdom; often this is next to a Military District, or at least some barracks where members of the city guard live. Usually I have a Guild District because two of the PCs belong to guilds, and they can usually find safety with their fellow guild members and brush up on current events.
For settlements smaller than a large city (and sometimes for districts within a large city), I note specific buildings - public buildings (where the PCs might be able to exchange money, make use of weights and measures, send messages, or pay to have valuables stored), theaters, stables, temples, taverns/inns, festival fields, etc. For decently sized settlements, I always have several taverns and/or inns and I give them distinct names and personalities (the Freeman's Rest is a classy inn frequented by well-to-do merchants; the Bawdy Brewer is a rough and tumble honky-tonk tavern with a boxing ring in the basement). I also name certain shops, such as apothecaries and magic shops (where those exist). Then there's stuff like parks, commonly-held farms and orchards, and various types of housing. If a town/city is known for something in particular, I make sure to include that. My town of Brynehall, for instance, exports whiskey and wool, so it has a distillery and a wool mill visible on the town map.
You can also forgo names and just use icons - a mug for taverns, a sword for weapons merchants, a breastplate for the armorer, etc.
I think your most recent city map layout looks great! Adding the common area and bazaars definitely gives it the feel of a bustling city.