After voting down a highly controversial sexual orientation and gender identity ordinance in March 2005, the Charlotte City Council passed a similar measure Feb. 22 requiring places of "public accommodation" to abide by a non-discrimination policy that includes "marital status, familial status, sexual orientation, gender identity and gender expression."