fixed optional data in annotations, fixing Leisure parsing bugs