diff --git a/classes/Visualizer/Module/Sources.php b/classes/Visualizer/Module/Sources.php
index c6da54f1..8abfc78a 100644
--- a/classes/Visualizer/Module/Sources.php
+++ b/classes/Visualizer/Module/Sources.php
@@ -56,7 +56,7 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		$this->_addFilter( Visualizer_Plugin::FILTER_GET_CHART_SERIES, 'filterChartSeries', 1, 2 );
 		$this->_addFilter( Visualizer_Plugin::FILTER_GET_CHART_DATA, 'filterChartData', 1, 2 );
 
-		$this->_addFilter( 'visualizer_pro_upsell', 'addProUpsell', 10, 1 );
+		$this->_addFilter( 'visualizer_pro_upsell', 'addProUpsell', 10, 2 );
 	}
 
 	/**
@@ -129,25 +129,27 @@ public function filterChartData( $data, $chart_id ) {
 	 * Add the pro upsell html.
 	 *
 	 * @param string $old The previous html string.
+	 * @param string $feature What feature is this filter running for.
 	 *
 	 * @return string The new html code.
 	 */
-	public function addProUpsell( $old ) {
-		if ( VISUALIZER_PRO ) {
+	public function addProUpsell( $old, $feature = null ) {
+		$return = '';
+		if ( ! $feature || ($feature == 'schedule-chart' && ! apply_filters( 'visualizer_is_business', false )) ) {
+			$return = '<div class="only-pro-content">';
+			$return .= '	<div class="only-pro-container">';
+			$return .= '		<div class="only-pro-inner">';
+			$return .= '			<p>' . __( 'Enable this feature in PRO version!', 'visualizer' ) . '</p>';
+			$return .= '            <a target="_blank" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" title="' . __( 'Buy now', 'visualizer' ) . '">' . __( 'Buy now', 'visualizer' ) . '</a>';
+			$return .= ' 		</div>';
+			$return .= ' 	</div>';
+			$return .= '</div>';
+		}
+		if ( ! $feature && defined( 'Visualizer_Pro' ) ) {
 			remove_filter( 'visualizer_pro_upsell', 'addProUpsell', 10, 1 );
-			return;
+			$return = '';
 		}
-		$return = '<div class="only-pro-content">';
-		$return .= '	<div class="only-pro-container">';
-		$return .= '		<div class="only-pro-inner">';
-		$return .= '			<p>' . __( 'Enable this feature in PRO version!', 'visualizer' ) . '</p>';
-		$return .= '            <a target="_blank" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" title="' . __( 'Buy now', 'visualizer' ) . '">' . __( 'Buy now', 'visualizer' ) . '</a>';
-		$return .= ' 		</div>';
-		$return .= ' 	</div>';
-		$return .= '</div>';
-
 		return $return;
-
 	}
 
 }
diff --git a/classes/Visualizer/Render/Page/Data.php b/classes/Visualizer/Render/Page/Data.php
index f026ae62..0a41bdf9 100644
--- a/classes/Visualizer/Render/Page/Data.php
+++ b/classes/Visualizer/Render/Page/Data.php
@@ -88,7 +88,7 @@ protected function _renderSidebarContent() {
 								</form>
 							</div>
 						</li>
-						<li class="group">
+						<li class="group visualizer-import-url">
 							<h2 class="group-title sub-group visualizer-src-tab"><?php _e( 'Import data from URL', 'visualizer' ); ?></h2>
 							<ul class="group-content">
 								<li class="subsection">
@@ -111,33 +111,43 @@ class="visualizer-input">
 										</form>
 									</div>
 								</li>
-								<li class="subsection <?php echo apply_filters( 'visualizer_pro_upsell_class','only-pro-feature' ); ?>">
-								<span class="section-title"><?php _e( 'Schedule Import', 'visualizer' ); ?><span
+								<li class="subsection <?php echo apply_filters( 'visualizer_pro_upsell_class','only-pro-feature', 'schedule-chart' ); ?>">
+								<span class="section-title visualizer-import-url-schedule"><?php _e( 'Schedule Import', 'visualizer' ); ?><span
 											class="dashicons dashicons-lock"></span></span>
 									<div class="section-items">
 										<p class="group-description"><?php _e( 'You can choose here to synchronize your chart data with a remote CSV file.', 'visualizer' ); ?> </p>
 										<p class="group-description"> <?php _e( 'You can also synchronize with your Google Spreadsheet file, for more info check <a href="https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
 										<p class="group-description"> <?php _e( 'We will update the chart data based on your time interval preference by overwritting the current data with the one from the URL.', 'visualizer' ); ?></p>
-										<form id="vz-schedule-import" action=" " method="post"
+										<form id="vz-schedule-import" action="<?php echo $upload_link ?>" method="post"
 											  target="thehole" enctype="multipart/form-data">
 											<div class="remote-file-section">
-												<input type="url" id="vz-schedule-url" name="remote_data"
+												<input type="url" id="vz-schedule-url" name="remote_data" value="<?php echo get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_CHART_URL, true );?>"
 													   placeholder="<?php esc_html_e( 'Please enter the URL of CSV file', 'visualizer' ); ?>"
-													   class="visualizer-input">
+													   class="visualizer-input visualizer-remote-url">
 												<p class="group-description"><?php _e( 'How often do you want to check the url', 'visualizer' ); ?></p>
-												<select name="vz-import-time" id="vz-import-time"
-														class="visualizer-select">
-													<option value="3600"><?php _e( 'Each hour', 'visualizer' ); ?></option>
-													<option value="43200"><?php _e( 'Each 12 hours', 'visualizer' ); ?></option>
-													<option value="86400"><?php _e( 'Each day', 'visualizer' ); ?></option>
-													<option value="259200"><?php _e( 'Each 3 days', 'visualizer' ); ?></option>
+												<select name="vz-import-time" id="vz-import-time" class="visualizer-select">
+												<?php
+												$hours  = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_CHART_SCHEDULE, true );
+												$schedules  = array(
+													'1'     => __( 'Each hour', 'visualizer' ),
+													'12'    => __( 'Each 12 hours', 'visualizer' ),
+													'24'    => __( 'Each day', 'visualizer' ),
+													'36'    => __( 'Each 3 days', 'visualizer' ),
+												);
+												foreach ( $schedules as $num => $name ) {
+													$extra  = $num == $hours ? 'selected' : '';
+												?>
+												<option value="<?php echo $num;?>" <?php echo $extra;?>><?php echo $name;?></option>
+												<?php
+												}
+												?>
 												</select>
 											</div>
 											<input type="button" id="vz-save-schedule" class="button button-primary"
 												   value="<?php _e( 'Save schedule', 'visualizer' ); ?>">
 
 
-											<?php echo apply_filters( 'visualizer_pro_upsell', '' ); ?>
+											<?php echo apply_filters( 'visualizer_pro_upsell', '', 'schedule-chart' ); ?>
 										</form>
 									</div>
 								</li>
diff --git a/languages/visualizer.pot b/languages/visualizer.pot
index 332d0a81..96ef4c0c 100644
--- a/languages/visualizer.pot
+++ b/languages/visualizer.pot
@@ -126,11 +126,11 @@ msgstr ""
 msgid "CSV file is broken or invalid. Please, try again."
 msgstr ""
 
-#: classes/Visualizer/Module/Sources.php:143
+#: classes/Visualizer/Module/Sources.php:142
 msgid "Enable this feature in PRO version!"
 msgstr ""
 
-#: classes/Visualizer/Module/Sources.php:144
+#: classes/Visualizer/Module/Sources.php:143
 msgid "Buy now"
 msgstr ""
 
@@ -289,67 +289,67 @@ msgstr ""
 msgid "How often do you want to check the url"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:130
+#: classes/Visualizer/Render/Page/Data.php:132
 msgid "Each hour"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:131
+#: classes/Visualizer/Render/Page/Data.php:133
 msgid "Each 12 hours"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:132
+#: classes/Visualizer/Render/Page/Data.php:134
 msgid "Each day"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:133
+#: classes/Visualizer/Render/Page/Data.php:135
 msgid "Each 3 days"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:137
+#: classes/Visualizer/Render/Page/Data.php:147
 msgid "Save schedule"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:148
+#: classes/Visualizer/Render/Page/Data.php:158
 msgid "Import from other chart"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:152
+#: classes/Visualizer/Render/Page/Data.php:162
 msgid "You can import here data from your previously created charts"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:180
+#: classes/Visualizer/Render/Page/Data.php:190
 msgid "Import Chart"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:187
+#: classes/Visualizer/Render/Page/Data.php:197
 msgid "Edit current data"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:195
+#: classes/Visualizer/Render/Page/Data.php:205
 msgid "You can manually edit the chart data using the spreadsheet like editor."
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:197
+#: classes/Visualizer/Render/Page/Data.php:207
 msgid "View Editor"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:197
+#: classes/Visualizer/Render/Page/Data.php:207
 msgid "Show Chart"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:207
+#: classes/Visualizer/Render/Page/Data.php:217
 msgid "Advanced Settings"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:210
+#: classes/Visualizer/Render/Page/Data.php:220
 msgid "Chart Settings"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:221
+#: classes/Visualizer/Render/Page/Data.php:231
 msgid "Rate our plugin"
 msgstr ""
 
-#: classes/Visualizer/Render/Page/Data.php:240
+#: classes/Visualizer/Render/Page/Data.php:250
 #: classes/Visualizer/Render/Page/Settings.php:55
 msgid "Back"
 msgstr ""