Fixes #24 #25 : Fix a case where viewForAnnotation: was called before assigning a cluster to the annotation