Listing New York City clubs by geography

As many of you surely know, the mailing address of a building in New York City can have one of a variety of different cities. Addresses in Bronx, NY, Brooklyn, NY and Staten Island, NY are found in the respective borough named. An address in New York, NY is almost certainly in Manhattan. (There may be exceptions, most notably Roosevelt Island. I don't think you'll find a strip club in any of these exceptions, though.) Addresses in Queens present a problem, since we write the name of our neighborhood (e.g., Long Island City, Rego Park) rather than that of our borough.

As a result, New York City areas are found all over the list on the New York (state) page, rather than being grouped next to each other. Founder, is it possible to change this? The Staten Island clubs are already grouped under the Manhattan clubs. How about changing the name of the location to "New York City -- [name of borough]" for all the boroughs, and for Queens, also adding the name of the neighborhood (e.g., "New York City -- Queens -- Long Island City")?