diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index bee6a6f..120e626 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,11 +6,21 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="libs-release" />
+      <option name="url" value="http://artifactory.autocrm.net/artifactory/libs-release" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="ZK CE" />
       <option name="name" value="ZK CE Repository" />
       <option name="url" value="https://mavensync.zkoss.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="snapshots" />
+      <option name="name" value="libs-snapshot" />
+      <option name="url" value="http://artifactory.autocrm.net/artifactory/libs-snapshot" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="ZK EVAL" />
       <option name="name" value="ZK Evaluation Repository" />
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_7_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_0.xml
similarity index 60%
rename from .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_7_1.xml
rename to .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_0.xml
index 650bf77..c708510 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_7_1.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_10_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.7.1">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.7.1/jackson-annotations-2.7.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.10.0/jackson-annotations-2.10.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.7.1/jackson-annotations-2.7.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.10.0/jackson-annotations-2.10.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.7.1/jackson-annotations-2.7.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.10.0/jackson-annotations-2.10.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_7_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_0.xml
similarity index 65%
rename from .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_7_1.xml
rename to .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_0.xml
index ddb1a86..ba1879a 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_7_1.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_10_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.7.1">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.7.1/jackson-core-2.7.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.10.0/jackson-core-2.10.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.7.1/jackson-core-2.7.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.10.0/jackson-core-2.10.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.7.1/jackson-core-2.7.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.10.0/jackson-core-2.10.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_7_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_0.xml
similarity index 62%
rename from .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_7_1.xml
rename to .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_0.xml
index fe262a0..1296654 100644
--- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_7_1.xml
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_10_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.7.1">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.7.1/jackson-databind-2.7.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.10.0/jackson-databind-2.10.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.7.1/jackson-databind-2.7.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.10.0/jackson-databind-2.10.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.7.1/jackson-databind-2.7.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.10.0/jackson-databind-2.10.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_omertron_themoviedbapi_4_3.xml b/.idea/libraries/Maven__com_omertron_themoviedbapi_4_4.xml
similarity index 62%
rename from .idea/libraries/Maven__com_omertron_themoviedbapi_4_3.xml
rename to .idea/libraries/Maven__com_omertron_themoviedbapi_4_4.xml
index 4dff84c..c7771fe 100644
--- a/.idea/libraries/Maven__com_omertron_themoviedbapi_4_3.xml
+++ b/.idea/libraries/Maven__com_omertron_themoviedbapi_4_4.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: com.omertron:themoviedbapi:4.3">
+  <library name="Maven: com.omertron:themoviedbapi:4.4">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/omertron/themoviedbapi/4.3/themoviedbapi-4.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/omertron/themoviedbapi/4.4/themoviedbapi-4.4.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/omertron/themoviedbapi/4.3/themoviedbapi-4.3-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/omertron/themoviedbapi/4.4/themoviedbapi-4.4-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/omertron/themoviedbapi/4.3/themoviedbapi-4.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/omertron/themoviedbapi/4.4/themoviedbapi-4.4-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml
similarity index 59%
rename from .idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
rename to .idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml
index 78cfcd3..28edf49 100644
--- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
+++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.apache.commons:commons-lang3:3.4">
+  <library name="Maven: org.apache.commons:commons-lang3:3.7">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml
similarity index 68%
rename from .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_1.xml
rename to .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml
index 958a9fa..c82bb7c 100644
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_1.xml
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.1">
+  <library name="Maven: org.apache.httpcomponents:httpclient:4.5.3">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.1/httpclient-4.5.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_3.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml
similarity index 59%
rename from .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_3.xml
rename to .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml
index a9f8d49..a9f6e19 100644
--- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_3.xml
+++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_6.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.3">
+  <library name="Maven: org.apache.httpcomponents:httpcore:4.4.6">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.3/httpcore-4.4.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.3/httpcore-4.4.3-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.3/httpcore-4.4.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_16.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
similarity index 64%
rename from .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_16.xml
rename to .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
index 3d1a710..20e8163 100644
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_16.xml
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.slf4j:slf4j-api:1.7.16">
+  <library name="Maven: org.slf4j:slf4j-api:1.7.25">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.16/slf4j-api-1.7.16.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.16/slf4j-api-1.7.16-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.16/slf4j-api-1.7.16-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yamj_api_common_2_0.xml b/.idea/libraries/Maven__org_yamj_api_common_2_1.xml
similarity index 67%
rename from .idea/libraries/Maven__org_yamj_api_common_2_0.xml
rename to .idea/libraries/Maven__org_yamj_api_common_2_1.xml
index 71b521f..71c3f20 100644
--- a/.idea/libraries/Maven__org_yamj_api_common_2_0.xml
+++ b/.idea/libraries/Maven__org_yamj_api_common_2_1.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.yamj:api-common:2.0">
+  <library name="Maven: org.yamj:api-common:2.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yamj/api-common/2.0/api-common-2.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/yamj/api-common/2.1/api-common-2.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yamj/api-common/2.0/api-common-2.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/yamj/api-common/2.1/api-common-2.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/yamj/api-common/2.0/api-common-2.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/yamj/api-common/2.1/api-common-2.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/multimedia.iml b/multimedia.iml
index 1d4ed32..f33aea6 100644
--- a/multimedia.iml
+++ b/multimedia.iml
@@ -31,47 +31,15 @@
     <orderEntry type="library" name="Maven: org.zkoss.theme:atlantic:9.5.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.zkoss.theme:sapphire:9.5.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.zkoss.theme:silvertail:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.omertron:themoviedbapi:4.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.16" level="project" />
-    <orderEntry type="library" name="Maven: org.yamj:api-common:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
+    <orderEntry type="library" name="Maven: com.omertron:themoviedbapi:4.4" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.yamj:api-common:2.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.zk:zkbind:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.2-GA" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.zk:zul:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.zk:zk:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.common:zweb:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.common:zcommon:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.common:zel:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache-extras.beanshell:bsh:2.0b6" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.zk:zkwebfragment:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.zk:zkplus:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.zk:zhtml:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss:zsoup:1.8.2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.17" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.theme:breeze:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.theme:atlantic:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.theme:sapphire:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.zkoss.theme:silvertail:9.5.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.omertron:themoviedbapi:4.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.16" level="project" />
-    <orderEntry type="library" name="Maven: org.yamj:api-common:2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 12d0ba5..39ee75f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,20 @@
 				<enabled>true</enabled>
 			</releases>
 		</repository>
+		<repository>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<id>central</id>
+			<name>libs-release</name>
+			<url>http://artifactory.autocrm.net/artifactory/libs-release</url>
+		</repository>
+		<repository>
+			<snapshots />
+			<id>snapshots</id>
+			<name>libs-snapshot</name>
+			<url>http://artifactory.autocrm.net/artifactory/libs-snapshot</url>
+		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
@@ -53,6 +67,20 @@
 			<name>ZK Maven Plugin Repository</name>
 			<url>https://mavensync.zkoss.org/maven2/</url>
 		</pluginRepository>
+		<pluginRepository>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+			<id>central</id>
+			<name>plugins-release</name>
+			<url>http://artifactory.autocrm.net/artifactory/plugins-release</url>
+		</pluginRepository>
+		<pluginRepository>
+			<snapshots />
+			<id>snapshots</id>
+			<name>plugins-snapshot</name>
+			<url>http://artifactory.autocrm.net/artifactory/plugins-snapshot</url>
+		</pluginRepository>
 	</pluginRepositories>
 	<dependencies>
 		<dependency>
@@ -127,7 +155,7 @@
 		<dependency>
 			<groupId>com.omertron</groupId>
 			<artifactId>themoviedbapi</artifactId>
-			<version>4.3</version>
+			<version>4.4</version>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/src/main/java/at/windesign/application/movie/movieDiscoverForwardComposer.java b/src/main/java/at/windesign/application/movie/movieDiscoverForwardComposer.java
new file mode 100644
index 0000000..8c0d593
--- /dev/null
+++ b/src/main/java/at/windesign/application/movie/movieDiscoverForwardComposer.java
@@ -0,0 +1,114 @@
+package at.windesign.application.movie;
+
+import com.omertron.themoviedbapi.TheMovieDbApi;
+import com.omertron.themoviedbapi.model.Genre;
+import com.omertron.themoviedbapi.results.ResultList;
+import org.apache.http.client.HttpClient;
+import org.yamj.api.common.http.SimpleHttpClientBuilder;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.select.annotation.Wire;
+import org.zkoss.zk.ui.util.GenericForwardComposer;
+import org.zkoss.zul.*;
+
+import java.util.List;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+public class movieDiscoverForwardComposer extends GenericForwardComposer<Component>
+{
+	private static final long            serialVersionUID = 1L;
+	private final        movieDataSource ds               = movieDataSource.INSTANCE;
+	private              int             opacity          = 80;
+
+	@Wire
+	private Window discoverMovie;
+
+	@Wire
+	private Groupbox groupboxGenre;
+
+	@Wire
+	private Div divGenre;
+
+	@Wire
+	private Groupbox groupboxSearch;
+
+	@Wire
+	protected Textbox searchText;
+
+	@Wire
+	protected Textbox searchYear;
+
+	@Wire
+	protected Listbox resultList;
+
+	@Wire
+	protected Button searchButton;
+
+	@Wire
+	protected Button cancelButton;
+
+	@Override
+	public void doAfterCompose(Component comp) throws Exception
+	{
+		super.doAfterCompose(comp);
+
+		int hD = (int) self.getDesktop().getAttribute("desktopHeight");
+		int wD = (int) self.getDesktop().getAttribute("desktopWidth");
+
+		discoverMovie.setWidth(wD - 10 + "px");
+		discoverMovie.setHeight(hD - 10 + "px");
+
+		SortedMap<Integer, Listheader> listHeader = new TreeMap<>();
+
+		ListModelList resultListModel = new ListModelList();
+		resultList.setModel(resultListModel);
+		resultList.setAttribute("listModelList", resultListModel);
+
+		resultList.getListhead().getChildren().clear();
+		Listhead   head       = resultList.getListhead();
+		Listheader selected   = new Listheader("");
+		Listheader movieName  = new Listheader("Movie Name");
+		Listheader voteCount = new Listheader("vote count");
+		Listheader voteAverage = new Listheader("vote average");
+		Listheader firstAired = new Listheader("First Aired");
+		Listheader overview   = new Listheader("Overview");
+
+		selected.setHflex("min");
+		movieName.setHflex("min");
+		voteCount.setHflex("min");
+		voteAverage.setHflex("min");
+		firstAired.setHflex("min");
+		overview.setHflex("min");
+
+		head.appendChild(selected);
+		head.appendChild(movieName);
+		head.appendChild(voteCount);
+		head.appendChild(voteAverage);
+		head.appendChild(firstAired);
+		head.appendChild(overview);
+
+		movieDiscoverRenderer renderer = new movieDiscoverRenderer();
+		resultList.setItemRenderer(renderer);
+
+		HttpClient        httpClient = new SimpleHttpClientBuilder().build();
+		TheMovieDbApi     api        = new TheMovieDbApi("a33271b9e54cdcb9a80680eaf5522f1b", httpClient);
+		ResultList<Genre> genres     = api.getGenreMovieList("de-DE");
+
+		List<Genre> genreList = genres.getResults();
+		int         cols      = genreList.size() / 5;
+		if(cols < 1)
+			cols = 1;
+		else if(genreList.size() % 5 != 0)
+			cols++;
+
+		divGenre.setStyle("display: grid; grid-template-columns: repeat(" + cols + ", 1fr); grid-auto-rows: 40px; align-items: left; justify-items: left;");
+
+		for(Genre genre : genreList)
+		{
+			Checkbox checkbox = new Checkbox();
+			checkbox.setLabel(genre.getName());
+			checkbox.setAttribute("genreID", genre.getId());
+			divGenre.insertBefore(checkbox, null);
+		}
+	}
+}
diff --git a/src/main/java/at/windesign/application/movie/movieDiscoverRenderer.java b/src/main/java/at/windesign/application/movie/movieDiscoverRenderer.java
new file mode 100644
index 0000000..34ab815
--- /dev/null
+++ b/src/main/java/at/windesign/application/movie/movieDiscoverRenderer.java
@@ -0,0 +1,35 @@
+package at.windesign.application.movie;
+
+import org.zkoss.zul.*;
+
+import java.text.DecimalFormat;
+
+public class movieDiscoverRenderer implements ListitemRenderer
+{
+	private Listbox movieList;
+
+	@Override
+	public void render(Listitem item, Object o, int i) throws Exception
+	{
+		final movieData data   = (movieData) o;
+		DecimalFormat format = new DecimalFormat("#.0");
+
+		Listcell selectedCell        = new Listcell();
+		Listcell movieNameCell       = new Listcell(data.getMovieTitle());
+		Listcell movieVoteCount      = new Listcell(String.valueOf(data.getVoteCount()));
+		Listcell movieVoteAverage    = new Listcell(format.format(data.getVoteAverage()));
+		Listcell movieFirstAiredCell = new Listcell(String.valueOf(data.getReleaseDate()));
+		Listcell movieOverviewCell   = new Listcell(data.getOverview());
+
+		Checkbox checkbox = new Checkbox();
+		checkbox.setParent(selectedCell);
+		selectedCell.setParent(item);
+		movieNameCell.setParent(item);
+		movieVoteCount.setParent(item);
+		movieVoteAverage.setParent(item);
+		movieFirstAiredCell.setParent(item);
+		movieOverviewCell.setParent(item);
+
+		item.setValue(data);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/at/windesign/application/movie/movieDiscoverSelectorComposer.java b/src/main/java/at/windesign/application/movie/movieDiscoverSelectorComposer.java
new file mode 100644
index 0000000..4e27c61
--- /dev/null
+++ b/src/main/java/at/windesign/application/movie/movieDiscoverSelectorComposer.java
@@ -0,0 +1,287 @@
+package at.windesign.application.movie;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.TheMovieDbApi;
+import com.omertron.themoviedbapi.model.discover.Discover;
+import com.omertron.themoviedbapi.model.discover.WithBuilder;
+import com.omertron.themoviedbapi.model.movie.MovieBasic;
+import com.omertron.themoviedbapi.results.ResultList;
+import org.apache.http.client.HttpClient;
+import org.yamj.api.common.http.SimpleHttpClientBuilder;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.Execution;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.select.SelectorComposer;
+import org.zkoss.zk.ui.select.annotation.Listen;
+import org.zkoss.zk.ui.select.annotation.Wire;
+import org.zkoss.zul.*;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.sql.Date;
+import java.text.DecimalFormat;
+import java.util.List;
+
+public class movieDiscoverSelectorComposer extends SelectorComposer<Component>
+{
+	private static final long    serialVersionUID = 1L;
+	private              Listbox m_movieList;
+
+	@Wire
+	private Window discoverMovie;
+
+	@Wire
+	private Div divGenre;
+
+	@Wire
+	protected Textbox searchText;
+
+	@Wire
+	protected Textbox searchYearGTE;
+
+	@Wire
+	protected Textbox searchYearLTE;
+
+	@Wire
+	protected Textbox searchVoteCountGTE;
+
+	@Wire
+	protected Textbox searchVoteCountLTE;
+
+	@Wire
+	protected Textbox searchVoteGTE;
+
+	@Wire
+	protected Textbox searchVoteLTE;
+
+	@Wire
+	protected Listbox resultList;
+
+	@Override
+	public void doAfterCompose(Component comp) throws Exception
+	{
+		super.doAfterCompose(comp);
+
+		final Execution execution = Executions.getCurrent();
+
+		if(execution.getArg().containsKey("movieList"))
+			m_movieList = (Listbox) execution.getArg().get("movieList");
+	}
+
+	@Listen("onClick = #searchButton")
+	public void doSearch()
+	{
+		try
+		{
+			search();
+		}
+		catch(Exception e)
+		{
+		}
+	}
+
+	@Listen("onClick = #saveButton")
+	public void save() throws FileNotFoundException
+	{
+		ListModelList   resultListModel = (ListModelList) resultList.getModel();
+		List<movieData> dataList        = resultListModel.getInnerList();
+
+		for(int index = 0; index < resultListModel.size(); index++)
+		{
+			Listitem item = resultList.getItemAtIndex(index);
+
+			if(item != null)
+			{
+				Listcell cell = (Listcell) item.getChildren().get(0);
+
+				if(cell != null)
+				{
+					Checkbox box = (Checkbox) cell.getChildren().get(0);
+
+					if(box != null)
+					{
+						if(box.isChecked())
+						{
+							movieData data     = dataList.get(index);
+							movieData newMovie = new movieData();
+
+							try
+							{
+								newMovie.fromTMDB(data.getMovieID());
+								newMovie.save();
+							}
+							catch(Exception e)
+							{
+							}
+						}
+					}
+				}
+			}
+			OutputStream tempFile    = new FileOutputStream("redir");
+			PrintStream  printStream = new PrintStream(tempFile);
+			printStream.print("movie");
+			printStream.close();
+
+			Executions.sendRedirect("");
+		}
+		discoverMovie.onClose();
+	}
+
+	@Listen("onClick = #cancelButton")
+	public void cancel()
+	{
+		discoverMovie.onClose();
+	}
+
+	public void search() throws MovieDbException
+	{
+		int maxPage = 10;
+		int page;
+
+		HttpClient httpClient;
+		httpClient = new SimpleHttpClientBuilder().build();
+
+		TheMovieDbApi api = new TheMovieDbApi("a33271b9e54cdcb9a80680eaf5522f1b", httpClient);
+
+		String sText         = searchText.getText();
+		String sYearGTE      = searchYearGTE.getText();
+		String sYearLTE      = searchYearLTE.getText();
+		int    yearGTE;
+		int    yearLTE;
+		String sVoteCountGTE = searchVoteCountGTE.getText();
+		String sVoteCountLTE = searchVoteCountLTE.getText();
+		int    voteCountGTE;
+		int    voteCountLTE;
+		String sVoteGTE      = searchVoteGTE.getText();
+		String sVoteLTE      = searchVoteLTE.getText();
+		float  voteGTE;
+		float  voteLTE;
+
+		if(sYearGTE.isEmpty())
+			yearGTE = 0;
+		else
+			yearGTE = Integer.parseInt(sYearGTE);
+
+		if(sYearLTE.isEmpty())
+			yearLTE = 0;
+		else
+			yearLTE = Integer.parseInt(sYearLTE);
+
+		if(yearGTE > 0 && yearLTE == 0)
+			yearLTE = 5000;
+
+		if(sVoteCountGTE.isEmpty())
+			voteCountGTE = 0;
+		else
+			voteCountGTE = Integer.parseInt(sVoteCountGTE);
+
+		if(sVoteCountLTE.isEmpty())
+			voteCountLTE = 0;
+		else
+			voteCountLTE = Integer.parseInt(sVoteCountLTE);
+
+		if(sVoteGTE.isEmpty())
+			voteGTE = 0;
+		else
+			voteGTE = Float.parseFloat(sVoteGTE);
+
+		if(sVoteLTE.isEmpty())
+			voteLTE = 0;
+		else
+			voteLTE = Float.parseFloat(sVoteLTE);
+
+		WithBuilder genres = null;
+		boolean     first  = true;
+
+		List<Checkbox> genreList = divGenre.getChildren();
+		for(Checkbox genre : genreList)
+		{
+			if(genre.isChecked())
+			{
+				int genreID = (int) genre.getAttribute("genreID");
+				if(first)
+				{
+					genres = new WithBuilder(genreID);
+					first  = false;
+				}
+				else
+					genres.and(genreID);
+			}
+		}
+
+		movieData     movie;
+		ListModelList resultListModel = (ListModelList) resultList.getModel();
+
+		resultListModel.clear();
+
+		for(page = 1; page <= maxPage; page++)
+		{
+			Discover discover = new Discover();
+			discover.page(page);
+			discover.language("de-DE");
+			discover.includeAdult(true);
+
+			if(yearGTE != 0)
+				discover.primaryReleaseDateGte(yearGTE + "-01-01");
+			else
+				discover.primaryReleaseDateGte("");
+			if(yearLTE != 0)
+				discover.primaryReleaseDateLte(yearLTE + "-12-31");
+			else
+				discover.primaryReleaseDateLte("");
+			discover.voteCountGte(voteCountGTE);
+			discover.voteCountLte(voteCountLTE);
+			discover.voteAverageGte(voteGTE);
+			discover.voteAverageLte(voteLTE);
+			discover.withGenres(genres);
+			discover.withKeywords(sText);
+
+			ResultList<MovieBasic> movies = api.getDiscoverMovies(discover);
+			if(movies.getResults().size() == 0)
+				break;
+
+			for(MovieBasic resultMovie : movies.getResults())
+			{
+				if(!exist(resultMovie.getId()))
+				{
+					movie = new movieData();
+
+					movie.setMovieID(resultMovie.getId());
+					movie.setMovieTitle(resultMovie.getTitle());
+					movie.setVoteCount(resultMovie.getVoteCount());
+					movie.setVoteAverage(resultMovie.getVoteAverage());
+					movie.setReleaseDate(string2Date(resultMovie.getReleaseDate()));
+					movie.setOverview(resultMovie.getOverview());
+
+					resultListModel.add(movie);
+					movie.setModel(resultListModel);
+				}
+			}
+		}
+	}
+
+	Date string2Date(String strDate)
+	{
+		if(strDate == null)
+			return new Date(1900, 1, 1);
+		else if(strDate.isEmpty())
+			return new Date(1900, 1, 1);
+		else
+			return Date.valueOf(strDate);
+	}
+
+	boolean exist(int id)
+	{
+		ListModelList   list     = (ListModelList) m_movieList.getModel();
+		List<movieData> dataList = list.getInnerList();
+
+		for(movieData data : dataList)
+		{
+			if(id == data.getMovieID())
+				return true;
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/at/windesign/application/movie/movieListSelectorComposer.java b/src/main/java/at/windesign/application/movie/movieListSelectorComposer.java
index cd74a2c..552e0ec 100644
--- a/src/main/java/at/windesign/application/movie/movieListSelectorComposer.java
+++ b/src/main/java/at/windesign/application/movie/movieListSelectorComposer.java
@@ -66,6 +66,19 @@ public class movieListSelectorComposer extends SelectorComposer<Component>
 		window.doModal();
 	}
 
+	@Listen("onClick = #discoverMovie")
+	public void onDiscoverMovie()
+	{
+		Map<String, Object> arguments = new HashMap<String, Object>();
+
+		arguments.put("movieList", movieList);
+
+		String template = "/movie/discoverMovie.zul";
+		Window window   = (Window) Executions.createComponents(template, null, arguments);
+
+		window.doModal();
+	}
+
 	@Listen("onClick = menuitem")
 	public void onMoviePopup(MouseEvent event)
 	{
diff --git a/src/main/java/at/windesign/application/serie/serieDiscoverForwardComposer.java b/src/main/java/at/windesign/application/serie/serieDiscoverForwardComposer.java
new file mode 100644
index 0000000..450acac
--- /dev/null
+++ b/src/main/java/at/windesign/application/serie/serieDiscoverForwardComposer.java
@@ -0,0 +1,114 @@
+package at.windesign.application.serie;
+
+import com.omertron.themoviedbapi.TheMovieDbApi;
+import com.omertron.themoviedbapi.model.Genre;
+import com.omertron.themoviedbapi.results.ResultList;
+import org.apache.http.client.HttpClient;
+import org.yamj.api.common.http.SimpleHttpClientBuilder;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.select.annotation.Wire;
+import org.zkoss.zk.ui.util.GenericForwardComposer;
+import org.zkoss.zul.*;
+
+import java.util.List;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+public class serieDiscoverForwardComposer extends GenericForwardComposer<Component>
+{
+	private static final long            serialVersionUID = 1L;
+	private final        serieDataSource ds               = serieDataSource.INSTANCE;
+	private              int             opacity          = 80;
+
+	@Wire
+	private Window discoverSerie;
+
+	@Wire
+	private Groupbox groupboxGenre;
+
+	@Wire
+	private Div divGenre;
+
+	@Wire
+	private Groupbox groupboxSearch;
+
+	@Wire
+	protected Textbox searchText;
+
+	@Wire
+	protected Textbox searchYear;
+
+	@Wire
+	protected Listbox resultList;
+
+	@Wire
+	protected Button searchButton;
+
+	@Wire
+	protected Button cancelButton;
+
+	@Override
+	public void doAfterCompose(Component comp) throws Exception
+	{
+		super.doAfterCompose(comp);
+
+		int hD = (int) self.getDesktop().getAttribute("desktopHeight");
+		int wD = (int) self.getDesktop().getAttribute("desktopWidth");
+
+		discoverSerie.setWidth(wD - 10 + "px");
+		discoverSerie.setHeight(hD - 10 + "px");
+
+		SortedMap<Integer, Listheader> listHeader = new TreeMap<>();
+
+		ListModelList resultListModel = new ListModelList();
+		resultList.setModel(resultListModel);
+		resultList.setAttribute("listModelList", resultListModel);
+
+		resultList.getListhead().getChildren().clear();
+		Listhead   head       = resultList.getListhead();
+		Listheader selected   = new Listheader("");
+		Listheader serieName  = new Listheader("TV Show Name");
+		Listheader voteCount = new Listheader("vote count");
+		Listheader voteAverage = new Listheader("vote average");
+		Listheader firstAired = new Listheader("First Aired");
+		Listheader overview   = new Listheader("Overview");
+
+		selected.setHflex("min");
+		serieName.setHflex("min");
+		voteCount.setHflex("min");
+		voteAverage.setHflex("min");
+		firstAired.setHflex("min");
+		overview.setHflex("min");
+
+		head.appendChild(selected);
+		head.appendChild(serieName);
+		head.appendChild(voteCount);
+		head.appendChild(voteAverage);
+		head.appendChild(firstAired);
+		head.appendChild(overview);
+
+		serieDiscoverRenderer renderer = new serieDiscoverRenderer();
+		resultList.setItemRenderer(renderer);
+
+		HttpClient        httpClient = new SimpleHttpClientBuilder().build();
+		TheMovieDbApi     api        = new TheMovieDbApi("a33271b9e54cdcb9a80680eaf5522f1b", httpClient);
+		ResultList<Genre> genres     = api.getGenreTVList("de-DE");
+
+		List<Genre> genreList = genres.getResults();
+		int         cols      = genreList.size() / 5;
+		if(cols < 1)
+			cols = 1;
+		else if(genreList.size() % 5 != 0)
+			cols++;
+
+		divGenre.setStyle("display: grid; grid-template-columns: repeat(" + cols + ", 1fr); grid-auto-rows: 40px; align-items: left; justify-items: left;");
+
+		for(Genre genre : genreList)
+		{
+			Checkbox checkbox = new Checkbox();
+			checkbox.setLabel(genre.getName());
+			checkbox.setAttribute("genreID", genre.getId());
+			divGenre.insertBefore(checkbox, null);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/at/windesign/application/serie/serieDiscoverRenderer.java b/src/main/java/at/windesign/application/serie/serieDiscoverRenderer.java
new file mode 100644
index 0000000..a6fbe65
--- /dev/null
+++ b/src/main/java/at/windesign/application/serie/serieDiscoverRenderer.java
@@ -0,0 +1,36 @@
+package at.windesign.application.serie;
+
+import at.windesign.application.movie.movieData;
+import org.zkoss.zul.*;
+
+import java.text.DecimalFormat;
+
+public class serieDiscoverRenderer implements ListitemRenderer
+{
+	private Listbox serieList;
+
+	@Override
+	public void render(Listitem item, Object o, int i) throws Exception
+	{
+		final serieData data   = (serieData) o;
+		DecimalFormat   format = new DecimalFormat("#.0");
+
+		Listcell selectedCell        = new Listcell();
+		Listcell serieNameCell       = new Listcell(data.getSeriesName());
+		Listcell serieVoteCount      = new Listcell(String.valueOf(data.getSeriesVoteCount()));
+		Listcell serieVoteAverage    = new Listcell(format.format(data.getSeriesVoteAverage()));
+		Listcell serieFirstAiredCell = new Listcell(String.valueOf(data.getSeriesFirstAired()));
+		Listcell serieOverviewCell   = new Listcell(data.getSeriesOverview());
+
+		Checkbox checkbox = new Checkbox();
+		checkbox.setParent(selectedCell);
+		selectedCell.setParent(item);
+		serieNameCell.setParent(item);
+		serieVoteCount.setParent(item);
+		serieVoteAverage.setParent(item);
+		serieFirstAiredCell.setParent(item);
+		serieOverviewCell.setParent(item);
+
+		item.setValue(data);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/at/windesign/application/serie/serieDiscoverSelectorComposer.java b/src/main/java/at/windesign/application/serie/serieDiscoverSelectorComposer.java
new file mode 100644
index 0000000..a96d72e
--- /dev/null
+++ b/src/main/java/at/windesign/application/serie/serieDiscoverSelectorComposer.java
@@ -0,0 +1,286 @@
+package at.windesign.application.serie;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import com.omertron.themoviedbapi.TheMovieDbApi;
+import com.omertron.themoviedbapi.model.discover.Discover;
+import com.omertron.themoviedbapi.model.discover.WithBuilder;
+import com.omertron.themoviedbapi.model.tv.TVBasic;
+import com.omertron.themoviedbapi.results.ResultList;
+import org.apache.http.client.HttpClient;
+import org.yamj.api.common.http.SimpleHttpClientBuilder;
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.Execution;
+import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.select.SelectorComposer;
+import org.zkoss.zk.ui.select.annotation.Listen;
+import org.zkoss.zk.ui.select.annotation.Wire;
+import org.zkoss.zul.*;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.sql.Date;
+import java.util.List;
+
+public class serieDiscoverSelectorComposer extends SelectorComposer<Component>
+{
+	private static final long    serialVersionUID = 1L;
+	private              Listbox m_serieList;
+
+	@Wire
+	private Window discoverSerie;
+
+	@Wire
+	private Div divGenre;
+
+	@Wire
+	protected Textbox searchText;
+
+	@Wire
+	protected Textbox searchYearGTE;
+
+	@Wire
+	protected Textbox searchYearLTE;
+
+	@Wire
+	protected Textbox searchVoteCountGTE;
+
+	@Wire
+	protected Textbox searchVoteCountLTE;
+
+	@Wire
+	protected Textbox searchVoteGTE;
+
+	@Wire
+	protected Textbox searchVoteLTE;
+
+	@Wire
+	protected Listbox resultList;
+
+	@Override
+	public void doAfterCompose(Component comp) throws Exception
+	{
+		super.doAfterCompose(comp);
+
+		final Execution execution = Executions.getCurrent();
+
+		if(execution.getArg().containsKey("serieList"))
+			m_serieList = (Listbox) execution.getArg().get("serieList");
+	}
+
+	@Listen("onClick = #searchButton")
+	public void doSearch()
+	{
+		try
+		{
+			search();
+		}
+		catch(Exception e)
+		{
+		}
+	}
+
+	@Listen("onClick = #saveButton")
+	public void save() throws FileNotFoundException
+	{
+		ListModelList   resultListModel = (ListModelList) resultList.getModel();
+		List<serieData> dataList        = resultListModel.getInnerList();
+
+		for(int index = 0; index < resultListModel.size(); index++)
+		{
+			Listitem item = resultList.getItemAtIndex(index);
+
+			if(item != null)
+			{
+				Listcell cell = (Listcell) item.getChildren().get(0);
+
+				if(cell != null)
+				{
+					Checkbox box = (Checkbox) cell.getChildren().get(0);
+
+					if(box != null)
+					{
+						if(box.isChecked())
+						{
+							serieData data     = dataList.get(index);
+							serieData newSerie = new serieData();
+
+							try
+							{
+								newSerie.fromTMDB(data.getSeriesID());
+								newSerie.save();
+							}
+							catch(Exception e)
+							{
+							}
+						}
+					}
+				}
+			}
+			OutputStream tempFile    = new FileOutputStream("redir");
+			PrintStream  printStream = new PrintStream(tempFile);
+			printStream.print("serie");
+			printStream.close();
+
+			Executions.sendRedirect("");
+		}
+		discoverSerie.onClose();
+	}
+
+	@Listen("onClick = #cancelButton")
+	public void cancel()
+	{
+		discoverSerie.onClose();
+	}
+
+	public void search() throws MovieDbException
+	{
+		int maxPage = 10;
+		int page;
+
+		HttpClient httpClient;
+		httpClient = new SimpleHttpClientBuilder().build();
+
+		TheMovieDbApi api = new TheMovieDbApi("a33271b9e54cdcb9a80680eaf5522f1b", httpClient);
+
+		String sText         = searchText.getText();
+		String sYearGTE      = searchYearGTE.getText();
+		String sYearLTE      = searchYearLTE.getText();
+		int    yearGTE;
+		int    yearLTE;
+		String sVoteCountGTE = searchVoteCountGTE.getText();
+		String sVoteCountLTE = searchVoteCountLTE.getText();
+		int    voteCountGTE;
+		int    voteCountLTE;
+		String sVoteGTE      = searchVoteGTE.getText();
+		String sVoteLTE      = searchVoteLTE.getText();
+		float  voteGTE;
+		float  voteLTE;
+
+		if(sYearGTE.isEmpty())
+			yearGTE = 0;
+		else
+			yearGTE = Integer.parseInt(sYearGTE);
+
+		if(sYearLTE.isEmpty())
+			yearLTE = 0;
+		else
+			yearLTE = Integer.parseInt(sYearLTE);
+
+		if(yearGTE > 0 && yearLTE == 0)
+			yearLTE = 5000;
+
+		if(sVoteCountGTE.isEmpty())
+			voteCountGTE = 0;
+		else
+			voteCountGTE = Integer.parseInt(sVoteCountGTE);
+
+		if(sVoteCountLTE.isEmpty())
+			voteCountLTE = 0;
+		else
+			voteCountLTE = Integer.parseInt(sVoteCountLTE);
+
+		if(sVoteGTE.isEmpty())
+			voteGTE = 0;
+		else
+			voteGTE = Float.parseFloat(sVoteGTE);
+
+		if(sVoteLTE.isEmpty())
+			voteLTE = 0;
+		else
+			voteLTE = Float.parseFloat(sVoteLTE);
+
+		WithBuilder genres = null;
+		boolean     first  = true;
+
+		List<Checkbox> genreList = divGenre.getChildren();
+		for(Checkbox genre : genreList)
+		{
+			if(genre.isChecked())
+			{
+				int genreID = (int) genre.getAttribute("genreID");
+				if(first)
+				{
+					genres = new WithBuilder(genreID);
+					first  = false;
+				}
+				else
+					genres.and(genreID);
+			}
+		}
+
+		serieData     serie;
+		ListModelList resultListModel = (ListModelList) resultList.getModel();
+
+		resultListModel.clear();
+
+		for(page = 1; page <= maxPage; page++)
+		{
+			Discover discover = new Discover();
+			discover.page(page);
+			discover.language("de-DE");
+			discover.includeAdult(true);
+
+			if(yearGTE != 0)
+				discover.primaryReleaseDateGte(yearGTE + "-01-01");
+			else
+				discover.primaryReleaseDateGte("");
+			if(yearLTE != 0)
+				discover.primaryReleaseDateLte(yearLTE + "-12-31");
+			else
+				discover.primaryReleaseDateLte("");
+			discover.voteCountGte(voteCountGTE);
+			discover.voteCountLte(voteCountLTE);
+			discover.voteAverageGte(voteGTE);
+			discover.voteAverageLte(voteLTE);
+			discover.withGenres(genres);
+			discover.withKeywords(sText);
+
+			ResultList<TVBasic> series = api.getDiscoverTV(discover);
+			if(series.getResults().size() == 0)
+				break;
+
+			for(TVBasic resultSerie : series.getResults())
+			{
+				if(!exist(resultSerie.getId()))
+				{
+					serie = new serieData();
+
+					serie.setSeriesID(resultSerie.getId());
+					serie.setSeriesName(resultSerie.getName());
+					serie.setSeriesVoteCount(resultSerie.getVoteCount());
+					serie.setSeriesVoteAverage(resultSerie.getVoteAverage());
+					serie.setSeriesFirstAired(string2Date(resultSerie.getFirstAirDate()));
+					serie.setSeriesOverview(resultSerie.getOverview());
+
+					resultListModel.add(serie);
+					serie.setModel(resultListModel);
+				}
+			}
+		}
+	}
+
+	Date string2Date(String strDate)
+	{
+		if(strDate == null)
+			return new Date(1900, 1, 1);
+		else if(strDate.isEmpty())
+			return new Date(1900, 1, 1);
+		else
+			return Date.valueOf(strDate);
+	}
+
+	boolean exist(int id)
+	{
+		ListModelList   list     = (ListModelList) m_serieList.getModel();
+		List<serieData> dataList = list.getInnerList();
+
+		for(serieData data : dataList)
+		{
+			if(id == data.getSeriesID())
+				return true;
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/at/windesign/application/serie/serieListSelectorComposer.java b/src/main/java/at/windesign/application/serie/serieListSelectorComposer.java
index 013a205..928ef0d 100644
--- a/src/main/java/at/windesign/application/serie/serieListSelectorComposer.java
+++ b/src/main/java/at/windesign/application/serie/serieListSelectorComposer.java
@@ -1,7 +1,5 @@
 package at.windesign.application.serie;
 
-import at.windesign.application.movie.movieData;
-import org.zkoss.zhtml.Li;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
@@ -80,6 +78,19 @@ public class serieListSelectorComposer extends SelectorComposer<Component>
 		window.doModal();
 	}
 
+	@Listen("onClick = #discoverSerie")
+	public void onDiscoverSerie()
+	{
+		Map<String, Object> arguments = new HashMap<String, Object>();
+
+		arguments.put("serieList", seriesList);
+
+		String template = "/serie/discoverSerie.zul";
+		Window window   = (Window) Executions.createComponents(template, null, arguments);
+
+		window.doModal();
+	}
+
 	@Listen("onClick = menuitem")
 	public void onSeriePopup(MouseEvent event)
 	{
@@ -87,6 +98,8 @@ public class serieListSelectorComposer extends SelectorComposer<Component>
 
 		if(label.compareToIgnoreCase("set all Progress to Done") == 0)
 			setAllProgressToDone();
+		else if(label.compareToIgnoreCase("update") == 0)
+			updateSerie();
 		else if(label.compareToIgnoreCase("delete") == 0)
 			deleteSerie();
 	}
diff --git a/src/main/webapp/movie/discoverMovie.zul b/src/main/webapp/movie/discoverMovie.zul
new file mode 100644
index 0000000..ec54199
--- /dev/null
+++ b/src/main/webapp/movie/discoverMovie.zul
@@ -0,0 +1,71 @@
+<window id="discoverMovie"
+        title="discover Movies"
+        contentStyle="overflow:auto"
+        border="normal"
+        apply="at.windesign.application.movie.movieDiscoverForwardComposer,at.windesign.application.movie.movieDiscoverSelectorComposer"
+        width="500px"
+        height="500px">
+    <groupbox id="groupboxGenre"
+              contentStyle="overflow: auto;">
+        <caption label="Genre"/>
+        <nodom>
+            <div sclass="grid"
+                 id="divGenre">
+            </div>
+        </nodom>
+    </groupbox>
+    <groupbox id="groupboxSearch"
+    >
+        <nodom>
+            <div sclass="grid"
+                 width="100%"
+                 style="display: grid; grid-template-columns: 10fr 2fr 2fr 2fr 2fr 2fr 2fr 1fr; grid-gap: 10px; justify-items: center">
+                <label value="Search"/>
+                <label value="Year from"/>
+                <label value="to"/>
+                <label value="vote count from"/>
+                <label value="to"/>
+                <label value="vote average from"/>
+                <label value="to (max 10)"/>
+                <label value=""/>
+                <textbox id="searchText"
+                         width="100%"
+                         tabindex="2"/>
+                <textbox id="searchYearGTE"
+                         width="100%"
+                         tabindex="3"/>
+                <textbox id="searchYearLTE"
+                         width="100%"
+                         tabindex="4"/>
+                <textbox id="searchVoteCountGTE"
+                         width="100%"
+                         tabindex="5"/>
+                <textbox id="searchVoteCountLTE"
+                         width="100%"
+                         tabindex="6"/>
+                <textbox id="searchVoteGTE"
+                         width="100%"
+                         tabindex="7"/>
+                <textbox id="searchVoteLTE"
+                         width="100%"
+                         tabindex="8"/>
+                <button id="searchButton"
+                        label="search"/>
+            </div>
+        </nodom>
+    </groupbox>
+    <listbox id="resultList"
+             multiple="true"
+             autopaging="true"
+             vflex="true">
+        <listhead sizable="true"
+        >
+        </listhead>
+    </listbox>
+    <hlayout>
+        <button id="saveButton"
+                label="save"/>
+        <button id="cancelButton"
+                label="cancel"/>
+    </hlayout>
+</window>
\ No newline at end of file
diff --git a/src/main/webapp/serie/discoverSerie.zul b/src/main/webapp/serie/discoverSerie.zul
new file mode 100644
index 0000000..1c9e201
--- /dev/null
+++ b/src/main/webapp/serie/discoverSerie.zul
@@ -0,0 +1,71 @@
+<window id="discoverSerie"
+        title="discover TV Shows"
+        contentStyle="overflow:auto"
+        border="normal"
+        apply="at.windesign.application.serie.serieDiscoverForwardComposer,at.windesign.application.serie.serieDiscoverSelectorComposer"
+        width="500px"
+        height="500px">
+    <groupbox id="groupboxGenre"
+              contentStyle="overflow: auto;">
+        <caption label="Genre"/>
+        <nodom>
+            <div sclass="grid"
+                 id="divGenre">
+            </div>
+        </nodom>
+    </groupbox>
+    <groupbox id="groupboxSearch"
+    >
+        <nodom>
+            <div sclass="grid"
+                 width="100%"
+                 style="display: grid; grid-template-columns: 10fr 2fr 2fr 2fr 2fr 2fr 2fr 1fr; grid-gap: 10px; justify-items: center">
+                <label value="Search"/>
+                <label value="Year from"/>
+                <label value="to"/>
+                <label value="vote count from"/>
+                <label value="to"/>
+                <label value="vote average from"/>
+                <label value="to (max 10)"/>
+                <label value=""/>
+                <textbox id="searchText"
+                         width="100%"
+                         tabindex="2"/>
+                <textbox id="searchYearGTE"
+                         width="100%"
+                         tabindex="3"/>
+                <textbox id="searchYearLTE"
+                         width="100%"
+                         tabindex="4"/>
+                <textbox id="searchVoteCountGTE"
+                         width="100%"
+                         tabindex="5"/>
+                <textbox id="searchVoteCountLTE"
+                         width="100%"
+                         tabindex="6"/>
+                <textbox id="searchVoteGTE"
+                         width="100%"
+                         tabindex="7"/>
+                <textbox id="searchVoteLTE"
+                         width="100%"
+                         tabindex="8"/>
+                <button id="searchButton"
+                        label="search"/>
+            </div>
+        </nodom>
+    </groupbox>
+    <listbox id="resultList"
+             multiple="true"
+             autopaging="true"
+             vflex="true">
+        <listhead sizable="true"
+        >
+        </listhead>
+    </listbox>
+    <hlayout>
+        <button id="saveButton"
+                label="save"/>
+        <button id="cancelButton"
+                label="cancel"/>
+    </hlayout>
+</window>
\ No newline at end of file
diff --git a/target/classes/at/windesign/application/movie/movieListSelectorComposer.class b/target/classes/at/windesign/application/movie/movieListSelectorComposer.class
index 7aac0c8..8638948 100644
Binary files a/target/classes/at/windesign/application/movie/movieListSelectorComposer.class and b/target/classes/at/windesign/application/movie/movieListSelectorComposer.class differ
diff --git a/target/classes/at/windesign/application/serie/serieListSelectorComposer.class b/target/classes/at/windesign/application/serie/serieListSelectorComposer.class
index 0f29943..9576789 100644
Binary files a/target/classes/at/windesign/application/serie/serieListSelectorComposer.class and b/target/classes/at/windesign/application/serie/serieListSelectorComposer.class differ
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 7615de7..f332126 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Thu Feb 25 15:44:13 CET 2021
+#Tue Mar 02 14:21:10 CET 2021
 groupId=at.windesign.application
 artifactId=multimedia
 version=1.0-SNAPSHOT
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index b3ee448..2a7cd23 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,7 +1,11 @@
 at\windesign\application\movie\movieSearchForwardComposer.class
-at\windesign\application\movie\movieResultRenderer.class
+at\windesign\application\movie\movieDiscoverForwardComposer.class
+at\windesign\application\serie\serieDiscoverForwardComposer.class
 at\windesign\application\serie\serieDataSource.class
+at\windesign\application\serie\serieDiscoverSelectorComposer.class
+at\windesign\application\movie\movieDiscoverRenderer.class
 at\windesign\application\serie\serieDetailsSelectorComposer.class
+at\windesign\application\serie\serieDiscoverRenderer.class
 at\windesign\application\serie\seasonData.class
 at\windesign\application\serie\serieRenderer.class
 at\windesign\application\serie\serieData.class
@@ -10,7 +14,6 @@ at\windesign\application\serie\serieDetailsForwardComposer$1.class
 at\windesign\application\serie\serieDetailsForwardComposer.class
 at\windesign\application\serie\serieDetailsSelectorComposer$1.class
 at\windesign\application\serie\serieListForwardComposer.class
-at\windesign\application\testing\testForwardComposer.class
 at\windesign\application\movie\movieSearchSelectorComposer.class
 at\windesign\application\movie\movieListSelectorComposer.class
 at\windesign\application\serie\episodeData.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
index 8dc1e8b..ff451f0 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -11,8 +11,10 @@ C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesi
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\serie\serieUpdateSelectorComposer.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\movie\movieSearchForwardComposer.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\serie\serieResultRenderer.java
+C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\movie\movieDiscoverSelectorComposer.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\movie\movieSearchSelectorComposer.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\serie\serieDataSource.java
+C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\movie\movieDiscoverRenderer.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\movie\movieUpdateSelectorComposer.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\serie\episodeData.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\movie\movieDetailsForwardComposer.java
@@ -22,6 +24,7 @@ C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesi
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\movie\movieDetailsSelectorComposer.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\movie\movieListSelectorComposer.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\serie\serieListSelectorComposer.java
+C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\movie\movieDiscoverForwardComposer.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\movie\movieUtils.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\serie\serieListForwardComposer.java
 C:\Users\birkeh\Documents\GitHub\intellij\zk\multimedia\src\main\java\at\windesign\application\testing\testForwardComposer.java
diff --git a/target/multimedia.war b/target/multimedia.war
index 2c45cc3..5b87743 100644
Binary files a/target/multimedia.war and b/target/multimedia.war differ
diff --git a/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieData.class b/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieData.class
index 9982197..a8a327d 100644
Binary files a/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieData.class and b/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieData.class differ
diff --git a/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieDetailsSelectorComposer.class b/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieDetailsSelectorComposer.class
index 0815b69..1717d2b 100644
Binary files a/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieDetailsSelectorComposer.class and b/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieDetailsSelectorComposer.class differ
diff --git a/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieListSelectorComposer.class b/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieListSelectorComposer.class
index 62c3366..8638948 100644
Binary files a/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieListSelectorComposer.class and b/target/multimedia/WEB-INF/classes/at/windesign/application/movie/movieListSelectorComposer.class differ
diff --git a/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieData.class b/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieData.class
index bce4739..5dda2c3 100644
Binary files a/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieData.class and b/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieData.class differ
diff --git a/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieDetailsSelectorComposer$1.class b/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieDetailsSelectorComposer$1.class
index 3803881..7558d46 100644
Binary files a/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieDetailsSelectorComposer$1.class and b/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieDetailsSelectorComposer$1.class differ
diff --git a/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieDetailsSelectorComposer.class b/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieDetailsSelectorComposer.class
index 8898132..42fc9b2 100644
Binary files a/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieDetailsSelectorComposer.class and b/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieDetailsSelectorComposer.class differ
diff --git a/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieListSelectorComposer.class b/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieListSelectorComposer.class
index 78fe511..0f29943 100644
Binary files a/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieListSelectorComposer.class and b/target/multimedia/WEB-INF/classes/at/windesign/application/serie/serieListSelectorComposer.class differ
diff --git a/target/multimedia/index.zul b/target/multimedia/index.zul
index 2c83db1..9859fce 100644
--- a/target/multimedia/index.zul
+++ b/target/multimedia/index.zul
@@ -9,7 +9,7 @@
 	>
 		<tabbox id="tabbox"
 				height="100%"
-				orient="left"
+				orient="top"
 		>
 			<tabs id="tabs"
 				  width="120px"
diff --git a/target/multimedia/movie/centerMovie.zul b/target/multimedia/movie/centerMovie.zul
index 03177db..87adec6 100644
--- a/target/multimedia/movie/centerMovie.zul
+++ b/target/multimedia/movie/centerMovie.zul
@@ -2,21 +2,46 @@
      vflex="true"
      apply="at.windesign.application.movie.movieListForwardComposer, at.windesign.application.movie.movieListSelectorComposer"
 >
-    <hbox width="100%" widths="100%" pack="stretch">
+    <hbox width="100%" pack="stretch">
         <button width="100%"
                 id="updateAll"
                 label="update all"
         >
         </button>
+        <button width="100%"
+                id="searchMovie"
+                label="search Movie"
+        >
+        </button>
+        <button width="100%"
+                id="discoverMovie"
+                label="discover Movie"
+        >
+        </button>
     </hbox>
+
     <listbox id="movieList"
              multiple="true"
              autopaging="true"
-             vflex="true">
+             vflex="true"
+             context="moviePopup"
+    >
         <listhead sizable="true"
         >
         </listhead>
         <!--		https://stackoverflow.com/questions/28629458/display-image-from-db-on-zk-zul-listbox-->
         <!--		https://www.zkoss.org/zksandbox/#u6-->
     </listbox>
+
+    <menupopup id="moviePopup">
+        <menu label="set status">
+            <menupopup>
+                <menuitem label="set Init"/>
+                <menuitem label="set Progress"/>
+                <menuitem label="set Done"/>
+            </menupopup>
+        </menu>
+        <menuitem label="update"/>
+        <menuitem label="delete"/>
+    </menupopup>
 </div>
diff --git a/target/multimedia/serie/centerSerie.zul b/target/multimedia/serie/centerSerie.zul
index 045e653..e316342 100644
--- a/target/multimedia/serie/centerSerie.zul
+++ b/target/multimedia/serie/centerSerie.zul
@@ -1,27 +1,51 @@
 <div id="centerSeries"
-	 vflex="true"
-	 apply="at.windesign.application.serie.serieListForwardComposer, at.windesign.application.serie.serieListSelectorComposer"
+     vflex="true"
+     apply="at.windesign.application.serie.serieListForwardComposer, at.windesign.application.serie.serieListSelectorComposer"
 >
-	<hbox width="100%" widths="50%,50%" pack="stretch">
-		<button width="100%"
-				id="updateAll"
-				label="update all"
-		>
-		</button>
-		<button width="100%"
-				id="updateOpen"
-				label="update open"
-		>
-		</button>
-	</hbox>
-	<listbox id="seriesList"
-			 multiple="true"
-			 autopaging="true"
-			 vflex="true">
-		<listhead sizable="true"
-		>
-		</listhead>
-		<!--		https://stackoverflow.com/questions/28629458/display-image-from-db-on-zk-zul-listbox-->
-		<!--		https://www.zkoss.org/zksandbox/#u6-->
-	</listbox>
+    <vlayout>
+        <hbox width="100%" widths="25%,25%,25%,25%" pack="stretch">
+            <button width="100%"
+                    id="updateAll"
+                    label="update all"
+            >
+            </button>
+            <button width="100%"
+                    id="updateOpen"
+                    label="update open"
+            >
+            </button>
+            <button width="100%"
+                    id="searchSerie"
+                    label="search TV Show"
+            >
+            </button>
+            <button width="100%"
+                    id="discoverSerie"
+                    label="discover TV Show"
+            >
+            </button>
+        </hbox>
+    </vlayout>
+    <listbox id="seriesList"
+             multiple="true"
+             autopaging="true"
+             vflex="true"
+             context="seriePopup"
+    >
+        <listhead sizable="true"
+        >
+        </listhead>
+        <!--		https://stackoverflow.com/questions/28629458/display-image-from-db-on-zk-zul-listbox-->
+        <!--		https://www.zkoss.org/zksandbox/#u6-->
+    </listbox>
+
+    <menupopup id="seriePopup">
+        <menu label="set status">
+            <menupopup>
+                <menuitem label="set all Progress to Done"/>
+            </menupopup>
+        </menu>
+        <menuitem label="update"/>
+        <menuitem label="delete"/>
+    </menupopup>
 </div>