diff --git a/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/input/ParametersPanel.java b/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/input/ParametersPanel.java
index 064a734fa..240a5c405 100644
--- a/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/input/ParametersPanel.java
+++ b/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/input/ParametersPanel.java
@@ -56,7 +56,13 @@ public List<AbstractParameterComponent<?>> addParameterComponents(List<Repositor
                 Number defaultValue = (param.getDefaultValue() == null) ? null : (Number)param.getDefaultValue();
                 parameterComponent = new NumberParameterComponent(param.getName(), param.getType(), defaultValue, param.getLabel(), param.isRequired(), textFieldPreferredHeight, textFieldBackgroundColor);
             } else if (param.getType() == LocalDateTime.class || param.getType() == LocalDateTime[].class) {
-                parameterComponent = new DateParameterComponent(param.getName(), param.getLabel(), param.isRequired(), textFieldPreferredHeight, textFieldBackgroundColor);
+                final DateParameterComponent dateParameterComponent = new DateParameterComponent(param.getName(), param.getLabel(), param.isRequired(), textFieldPreferredHeight, textFieldBackgroundColor);
+                if (param.getName().toLowerCase().startsWith("start")) {
+                    dateParameterComponent.setParameterValue(LocalDateTime.now().minusDays(1));
+                } else if (param.getName().toLowerCase().startsWith("end")) {
+                    dateParameterComponent.setParameterValue(LocalDateTime.now());
+                }
+                parameterComponent = dateParameterComponent;
             } else if (param.getType() == String[].class) {
                 String defaultValue = (param.getDefaultValue() == null) ? null : param.getDefaultValue().toString();
                 if(param.getName().toLowerCase().contentEquals("password")){
diff --git a/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/remote/download/DownloadProductListTimerRunnable.java b/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/remote/download/DownloadProductListTimerRunnable.java
index d82b1f8a0..d8a721c07 100644
--- a/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/remote/download/DownloadProductListTimerRunnable.java
+++ b/snap-product-library-ui-v2/src/main/java/org/esa/snap/product/library/ui/v2/repository/remote/download/DownloadProductListTimerRunnable.java
@@ -80,9 +80,10 @@ public void notifyPageProducts(int pageNumber, List<RepositoryProduct> pageResul
                     if (!isFinished()) {
                         updatePageProductsLater(pageResults, totalProductCount, retrievedProductCount);
                         if (!downloadsAllPages() && retrievedProductCount < totalProductCount) {
-                            hideProgressPanelLater();
                             synchronized (lock) {
                                 try {
+                                    lock.wait(500);
+                                    hideProgressPanelLater();
                                     lock.wait();
                                 } catch (InterruptedException e) {
                                     Thread.currentThread().interrupt();