Better annotations behavior for cities

fixes #18