Added check for 'data-indicator-value' attribute