City Council votes on proposed city charter amendments for May ballot