diff --git a/src/components/CalendarDay.vue b/src/components/CalendarDay.vue
index 0e93213c5..c28c9dda9 100755
--- a/src/components/CalendarDay.vue
+++ b/src/components/CalendarDay.vue
@@ -64,6 +64,7 @@
 
 <script>
 import defaults from '../utils/defaults';
+import { arrayHasItems } from '../utils/helpers';
 
 export default {
   props: {
@@ -107,16 +108,16 @@ export default {
       return this.attributes.find(this.dayInfo);
     },
     hasBackgrounds() {
-      return this.backgrounds && this.backgrounds.length;
+      return arrayHasItems(this.backgrounds);
     },
     hasDots() {
-      return this.dots && this.dots.length;
+      return arrayHasItems(this.dots);
     },
     dotsStyle_() {
       return this.styles.dots;
     },
     hasBars() {
-      return this.bars && this.bars.length;
+      return arrayHasItems(this.bars);
     },
     barsStyle_() {
       return this.styles.bars;
@@ -126,6 +127,15 @@ export default {
         this.backgrounds.map(b => b.highlight) :
         [];
     },
+    attributesMap() {
+      return this.attributeDates.reduce((map, ad) => {
+        map[ad.attribute.key] = {
+          ...ad.attribute,
+          targetDate: ad.dateInfo,
+        };
+        return map;
+      }, {});
+    },
   },
   watch: {
     attributes() {
@@ -160,21 +170,21 @@ export default {
         Math.abs(state.x - state.startX) <= defaults.maxTapTolerance &&
         Math.abs(state.y - state.startY) <= defaults.maxTapTolerance;
       if (state.tapDetected) {
-        this.$emit('daySelect', this.dayInfo);
+        this.$emit('daySelect', this.dayInfo, this.attributesMap);
       }
       state.started = false;
     },
     click() {
       if (this.touchState && this.touchState.tapDetected) return;
-      this.$emit('daySelect', this.dayInfo);
+      this.$emit('daySelect', this.dayInfo, this.attributesMap);
     },
     mouseenter() {
       this.isHovered = true;
-      this.$emit('dayMouseEnter', this.dayInfo);
+      this.$emit('dayMouseEnter', this.dayInfo, this.attributesMap);
     },
     mouseleave() {
       this.isHovered = false;
-      this.$emit('dayMouseLeave', this.dayInfo);
+      this.$emit('dayMouseLeave', this.dayInfo, this.attributesMap);
     },
     processAttributes() {
       const backgrounds = [];
diff --git a/src/utils/attribute.js b/src/utils/attribute.js
index a4f69afe1..cd8ab8901 100644
--- a/src/utils/attribute.js
+++ b/src/utils/attribute.js
@@ -36,7 +36,6 @@ const Attribute = (config) => {
     },
     // Accepts: DayInfo object
     // Returns: First attribute date or date range that occurs on given day.
-    // includesDay: dayInfo => dates.map(d => d.includesDay(dayInfo)).find(d => d),
     includesDay: (dayInfo) => {
       const matchDate = dates
         .map(d => d.includesDay(dayInfo))
diff --git a/src/utils/dateInfo.js b/src/utils/dateInfo.js
index 5879adadb..33d31f094 100644
--- a/src/utils/dateInfo.js
+++ b/src/utils/dateInfo.js
@@ -180,7 +180,7 @@ const DateInfo = (config, order) => {
       }
     }
     // Assign flag if date info is complex
-    info.isComplex = info.on;
+    info.isComplex = !!info.on;
   }
   // Determines if any part of this date intersects any part of the other date
   info.intersectsDate = (other) => {