Added logic to display correct annotation view