settings annotation improvements