Moved adding annotations to a later point so that cluster are set when map view viewForAnnotation delegate is called