Fix plural; Fix change to emptyevent causing [object Object]