diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 5585e32..2a6befb 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>gwtchosen-project</artifactId>
         <groupId>com.arcbees</groupId>
@@ -35,6 +36,23 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <outputDirectory>${webappDirectory}/WEB-INF/classes</outputDirectory>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${target.jdk}</source>
+                    <target>${target.jdk}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>integration-test</id>
@@ -48,6 +66,8 @@
                             <systemPropertyVariables>
                                 <testPort>${allocated-port}</testPort>
                             </systemPropertyVariables>
+                            <parallel>all</parallel>
+                            <threadCount>1</threadCount>
                         </configuration>
                         <executions>
                             <execution>
@@ -63,11 +83,16 @@
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>gwt-maven-plugin</artifactId>
                         <version>${gwt.version}</version>
+                        <configuration>
+                            <copyWebapp>true</copyWebapp>
+                            <hostedWebapp>${webappDirectory}</hostedWebapp>
+
+                            <module>com.arcbees.chosen.integrationtest.ChosenIntegrationTests</module>
+
+                            <runTarget>index.html</runTarget>
+                        </configuration>
                         <executions>
                             <execution>
-                                <configuration>
-                                    <module>com.arcbees.chosen.integrationtest.ChosenIntegrationTests</module>
-                                </configuration>
                                 <goals>
                                     <goal>compile</goal>
                                 </goals>
diff --git a/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/ChosenSampleIntegrationTests.java b/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/ChosenSampleIntegrationTests.java
index b0c7e73..7e8ef55 100644
--- a/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/ChosenSampleIntegrationTests.java
+++ b/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/ChosenSampleIntegrationTests.java
@@ -21,6 +21,7 @@
 
 import com.arcbees.chosen.integrationtest.client.testcases.AllowSingleDeselect;
 import com.arcbees.chosen.integrationtest.client.testcases.ChooseOption;
+import com.arcbees.chosen.integrationtest.client.testcases.ChosenListBoxMultipleSelectAddItems;
 import com.arcbees.chosen.integrationtest.client.testcases.DisableSearchThreshold;
 import com.arcbees.chosen.integrationtest.client.testcases.EnabledDisabled;
 import com.arcbees.chosen.integrationtest.client.testcases.HideEmptyValues;
@@ -28,7 +29,9 @@
 import com.arcbees.chosen.integrationtest.client.testcases.SearchContains;
 import com.arcbees.chosen.integrationtest.client.testcases.ShowNonEmptyValues;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleMultiValueListBox;
+import com.arcbees.chosen.integrationtest.client.testcases.SimpleMultiValueListBoxOnChange;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleValueListBox;
+import com.arcbees.chosen.integrationtest.client.testcases.SimpleValueListBoxOnChange;
 import com.arcbees.chosen.integrationtest.client.testcases.SingleBackstrokeDelete;
 import com.arcbees.chosen.integrationtest.client.testcases.TabNavigation;
 import com.arcbees.chosen.integrationtest.client.testcases.dropdownposition.Above;
@@ -66,6 +69,9 @@ public ChosenSampleIntegrationTests() {
         registerTestCase(new SearchContains());
         registerTestCase(new MaxSelectedOptions());
         registerTestCase(new SingleBackstrokeDelete());
+        registerTestCase(new SimpleValueListBoxOnChange());
+        registerTestCase(new SimpleMultiValueListBoxOnChange());
+        registerTestCase(new ChosenListBoxMultipleSelectAddItems());
     }
 
     @Override
diff --git a/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/ChosenListBoxMultipleSelectAddItems.java b/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/ChosenListBoxMultipleSelectAddItems.java
new file mode 100644
index 0000000..1f1ebdd
--- /dev/null
+++ b/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/ChosenListBoxMultipleSelectAddItems.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2015 ArcBees Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.arcbees.chosen.integrationtest.client.testcases;
+
+import com.arcbees.chosen.client.gwt.ChosenListBox;
+import com.arcbees.chosen.integrationtest.client.TestCase;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.RootPanel;
+
+public class ChosenListBoxMultipleSelectAddItems extends TestCase {
+    public static final String BUTTON_ID = "ChosenListBoxMultipleSelectAddItems-button";
+    public static final String SELECTED_VALUE = "Six";
+
+    @Override
+    public void run() {
+        final ChosenListBox listBox = new ChosenListBox(true);
+        listBox.setWidth("200px");
+        listBox.addItem("One");
+        listBox.addItem("Two");
+        listBox.addItem("Three");
+
+        Button button = new Button("Add items and select Six");
+        button.getElement().setId(BUTTON_ID);
+        button.addClickHandler(new ClickHandler() {
+            @Override
+            public void onClick(ClickEvent event) {
+                listBox.clear();
+                listBox.addItem("Four");
+                listBox.addItem("Five");
+                listBox.addItem("Six");
+                listBox.update();
+                listBox.setSelectedValue(SELECTED_VALUE);
+            }
+        });
+
+        RootPanel.get().add(listBox);
+        RootPanel.get().add(button);
+    }
+}
diff --git a/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/SimpleMultiValueListBoxOnChange.java b/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/SimpleMultiValueListBoxOnChange.java
new file mode 100644
index 0000000..1ffade3
--- /dev/null
+++ b/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/SimpleMultiValueListBoxOnChange.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015 ArcBees Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.arcbees.chosen.integrationtest.client.testcases;
+
+import java.util.List;
+
+import com.arcbees.chosen.client.ChosenOptions;
+import com.arcbees.chosen.integrationtest.client.domain.CarBrand;
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.RootPanel;
+
+public class SimpleMultiValueListBoxOnChange extends SimpleMultiValueListBox {
+    public static final String PLACEHOLDER = "Some placeholder";
+    public static final String LABEL_ID = "SimpleMultiValueListBoxOnChange-label";
+
+    public SimpleMultiValueListBoxOnChange() {
+        super(createChosenOption());
+    }
+
+    @Override
+    public void run() {
+        super.run();
+
+        final Label label = new Label();
+        label.getElement().setId(LABEL_ID);
+
+        getListBox().addValueChangeHandler(new ValueChangeHandler<List<CarBrand>>() {
+            @Override
+            public void onValueChange(ValueChangeEvent<List<CarBrand>> event) {
+                label.setText(joinValues(event.getValue()));
+            }
+        });
+
+        RootPanel.get().add(label);
+    }
+
+    private String joinValues(List<CarBrand> value) {
+        if (value.isEmpty()) {
+            return "";
+        } else if (value.size() == 1) {
+            return value.get(0).name();
+        } else {
+            String result = value.get(0).name();
+            for (int i = 1; i < value.size(); i++) {
+                result += ", " + value.get(i).name();
+            }
+
+            return result;
+        }
+    }
+
+    private static ChosenOptions createChosenOption() {
+        ChosenOptions chosenOptions = new ChosenOptions();
+        chosenOptions.setPlaceholderText(PLACEHOLDER);
+        chosenOptions.setAllowSingleDeselect(true);
+
+        return chosenOptions;
+    }
+}
diff --git a/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/SimpleValueListBoxOnChange.java b/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/SimpleValueListBoxOnChange.java
new file mode 100644
index 0000000..2e4f9ad
--- /dev/null
+++ b/integration-test/src/main/java/com/arcbees/chosen/integrationtest/client/testcases/SimpleValueListBoxOnChange.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2015 ArcBees Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.arcbees.chosen.integrationtest.client.testcases;
+
+import com.arcbees.chosen.client.ChosenOptions;
+import com.arcbees.chosen.integrationtest.client.domain.CarBrand;
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.RootPanel;
+
+public class SimpleValueListBoxOnChange extends SimpleValueListBox {
+    public static final String PLACEHOLDER = "Some placeholder";
+    public static final String LABEL_ID = "SimpleValueListBoxOnChange-label";
+
+    public SimpleValueListBoxOnChange() {
+        super(createChosenOption(), true);
+    }
+
+    @Override
+    public void run() {
+        super.run();
+
+        final Label label = new Label();
+        label.getElement().setId(LABEL_ID);
+
+        getListBox().addValueChangeHandler(new ValueChangeHandler<CarBrand>() {
+            @Override
+            public void onValueChange(ValueChangeEvent<CarBrand> event) {
+                CarBrand value = event.getValue();
+                label.setText(value == null ? "" : value.name());
+            }
+        });
+
+        RootPanel.get().add(label);
+    }
+
+    private static ChosenOptions createChosenOption() {
+        ChosenOptions chosenOptions = new ChosenOptions();
+        chosenOptions.setPlaceholderText(PLACEHOLDER);
+        chosenOptions.setAllowSingleDeselect(true);
+
+        return chosenOptions;
+    }
+}
diff --git a/integration-test/src/test/java/ChosenIT.java b/integration-test/src/test/java/ChosenIT.java
index 1cd26bf..c788edd 100644
--- a/integration-test/src/test/java/ChosenIT.java
+++ b/integration-test/src/test/java/ChosenIT.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 ArcBees Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -16,8 +16,10 @@
 
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.TimeoutException;
@@ -35,7 +37,9 @@
 import com.arcbees.chosen.integrationtest.client.testcases.SearchContains;
 import com.arcbees.chosen.integrationtest.client.testcases.ShowNonEmptyValues;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleMultiValueListBox;
+import com.arcbees.chosen.integrationtest.client.testcases.SimpleMultiValueListBoxOnChange;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleValueListBox;
+import com.arcbees.chosen.integrationtest.client.testcases.SimpleValueListBoxOnChange;
 import com.arcbees.test.ByDebugId;
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
@@ -47,6 +51,7 @@
 import static org.openqa.selenium.support.ui.ExpectedConditions.elementToBeClickable;
 import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfAllElementsLocatedBy;
 import static org.openqa.selenium.support.ui.ExpectedConditions.presenceOfElementLocated;
+import static org.openqa.selenium.support.ui.ExpectedConditions.textToBePresentInElement;
 
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.AUDI;
 import static com.arcbees.chosen.integrationtest.client.domain.CarBrand.FORD;
@@ -63,6 +68,11 @@ public void after() {
         webDriver.quit();
     }
 
+    @Before
+    public void before() {
+        webDriver.manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS);
+    }
+
     @Test
     public void chooseOption() throws Throwable {
         // Given
@@ -214,6 +224,40 @@ public void search_single_reduceOptions() {
         assertThat(options).contains(audi);
     }
 
+    /**
+     * Tests that the ValueChangeEvent is working with the ChosenValueListBox.
+     * See https://github.com/ArcBees/gwtchosen/issues/269
+     */
+    @Test
+    public void select_singleValueListBox_changeEvent() throws InterruptedException {
+        // Given
+        loadTestCase(new SimpleValueListBoxOnChange());
+        String fordRender = RENDERER.render(FORD);
+
+        // When
+        clickOptionWithDisplayString(fordRender);
+
+        // Then
+        WebElement label = getElementById(SimpleValueListBoxOnChange.LABEL_ID);
+        webDriverWait().until(textToBePresentInElement(label, fordRender));
+        assertThat(label.getText()).isEqualTo(fordRender);
+    }
+
+    @Test
+    public void select_multiValueListBox_changeEvent() throws InterruptedException {
+        // Given
+        loadTestCase(new SimpleMultiValueListBoxOnChange());
+        String fordRender = RENDERER.render(FORD);
+
+        // When
+        clickOptionWithDisplayString(fordRender);
+
+        // Then
+        WebElement label = getElementById(SimpleMultiValueListBoxOnChange.LABEL_ID);
+        webDriverWait().until(textToBePresentInElement(label, fordRender));
+        assertThat(label.getText()).isEqualTo(fordRender);
+    }
+
     /**
      * This test makes sure that when null values are rendered as a non-empty string,
      * then that exact non-empty string will be displayed in the dropdown options.
@@ -320,6 +364,10 @@ protected void singleDeselect() {
         abbr.click();
     }
 
+    protected WebElement getElementById(String id) {
+        return webDriverWait().until(presenceOfElementLocated(By.id(id)));
+    }
+
     protected WebDriverWait webDriverWait() {
         return new WebDriverWait(webDriver, TIME_OUT_IN_SECONDS);
     }
diff --git a/integration-test/src/test/java/DesktopChosenIT.java b/integration-test/src/test/java/DesktopChosenIT.java
index 6e190d2..75a2a6a 100644
--- a/integration-test/src/test/java/DesktopChosenIT.java
+++ b/integration-test/src/test/java/DesktopChosenIT.java
@@ -24,6 +24,7 @@
 
 import com.arcbees.chosen.integrationtest.client.domain.CarBrand;
 import com.arcbees.chosen.integrationtest.client.testcases.AllowSingleDeselect;
+import com.arcbees.chosen.integrationtest.client.testcases.ChosenListBoxMultipleSelectAddItems;
 import com.arcbees.chosen.integrationtest.client.testcases.MaxSelectedOptions;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleMultiValueListBox;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleValueListBox;
@@ -269,6 +270,22 @@ public void singleMobile_mobileLayoutUsed() throws InterruptedException {
         assertThat(getOptions()).isEqualTo(CarBrand.getAllNames(RENDERER));
     }
 
+    /**
+     * Tests that the values are added/selected when using update/setItemSelected.
+     * See https://github.com/ArcBees/gwtchosen/issues/271
+     */
+    @Test
+    public void chosenListBox_updateAndSelect_addsAndSelectItem() {
+        // Given
+        loadTestCase(new ChosenListBoxMultipleSelectAddItems());
+
+        // When
+        getElementById(ChosenListBoxMultipleSelectAddItems.BUTTON_ID).click();
+
+        // Then
+        assertThat(getSelectedOptionText()).isEqualTo(ChosenListBoxMultipleSelectAddItems.SELECTED_VALUE);
+    }
+
     /**
      * Goal: verify that tab navigation is possible when Chosen is within a form.
      */
diff --git a/integration-test/src/test/java/MobileChosenIT.java b/integration-test/src/test/java/MobileChosenIT.java
index a78be4a..ed9d77d 100644
--- a/integration-test/src/test/java/MobileChosenIT.java
+++ b/integration-test/src/test/java/MobileChosenIT.java
@@ -23,6 +23,7 @@
 import org.openqa.selenium.WebElement;
 
 import com.arcbees.chosen.integrationtest.client.domain.CarBrand;
+import com.arcbees.chosen.integrationtest.client.testcases.ChosenListBoxMultipleSelectAddItems;
 import com.arcbees.chosen.integrationtest.client.testcases.MaxSelectedOptions;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleMultiValueListBox;
 import com.arcbees.chosen.integrationtest.client.testcases.SimpleValueListBox;
@@ -133,6 +134,22 @@ public void singleMobile_closeDropdown() throws InterruptedException {
         assertDropdownIsClosed();
     }
 
+    /**
+     * Tests that the values are added/selected when using update/setItemSelected.
+     * See https://github.com/ArcBees/gwtchosen/issues/271
+     */
+    @Test
+    public void chosenListBox_updateAndSelect_addsAndSelectItem() {
+        // Given
+        loadTestCase(new ChosenListBoxMultipleSelectAddItems());
+
+        // When
+        getElementById(ChosenListBoxMultipleSelectAddItems.BUTTON_ID).click();
+
+        // Then
+        assertThat(getSelectedOptionText()).isEqualTo("1 item selected");
+    }
+
     @Override
     protected void assertDropdownIsClosed() {
         webDriverWait().until(new Predicate<WebDriver>() {
diff --git a/plugin/src/main/java/com/arcbees/chosen/client/AbstractMobileChosenImpl.java b/plugin/src/main/java/com/arcbees/chosen/client/AbstractMobileChosenImpl.java
index 57641c0..62af640 100644
--- a/plugin/src/main/java/com/arcbees/chosen/client/AbstractMobileChosenImpl.java
+++ b/plugin/src/main/java/com/arcbees/chosen/client/AbstractMobileChosenImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014 ArcBees Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
diff --git a/plugin/src/main/java/com/arcbees/chosen/client/ChosenImpl.java b/plugin/src/main/java/com/arcbees/chosen/client/ChosenImpl.java
index 56ab2cb..270a5e4 100644
--- a/plugin/src/main/java/com/arcbees/chosen/client/ChosenImpl.java
+++ b/plugin/src/main/java/com/arcbees/chosen/client/ChosenImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 ArcBees Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -578,9 +578,17 @@ protected OptionItem getOptionItem(GQuery result) {
     }
 
     protected void onResultSelected(OptionItem item, String newValue, String oldValue, boolean metaKeyPressed) {
+        fireChosenChangeEventIfNotEqual(item, newValue, oldValue);
+
         resultsHide();
     }
 
+    protected void fireChosenChangeEventIfNotEqual(OptionItem item, String newValue, String oldValue) {
+        if (oldValue == null || !oldValue.equals(newValue)) {
+            fireEvent(new ChosenChangeEvent(newValue, item.getArrayIndex(), this));
+        }
+    }
+
     protected void addChoice(OptionItem item) {
         selectedItem.find("span").text(item.getText());
         if (allowSingleDeselect) {
@@ -622,7 +630,9 @@ protected void resultsHide() {
     }
 
     protected void resultsResetCleanup() {
-        selectedItem.find("abbr").remove();
+        if (selectedItem != null) {
+            selectedItem.find("abbr").remove();
+        }
     }
 
     protected void resultsSearch() {
@@ -682,6 +692,7 @@ protected boolean searchResultsMouseUp(Event e) {
             resultHighlight = target;
             resultSelect(e);
         }
+
         return false;
     }
 
@@ -828,9 +839,6 @@ protected void closeField() {
         container.removeClass(css.chznContainerActive());
         winnowResultsClear();
 
-        // TODO check if it's needed
-        // clearBackstroke();
-
         showSearchFieldDefault(defaultText);
         searchFieldScale(fWidth);
     }
diff --git a/plugin/src/main/java/com/arcbees/chosen/client/DesktopMultipleChosenImpl.java b/plugin/src/main/java/com/arcbees/chosen/client/DesktopMultipleChosenImpl.java
index a6be943..6d8eb26 100644
--- a/plugin/src/main/java/com/arcbees/chosen/client/DesktopMultipleChosenImpl.java
+++ b/plugin/src/main/java/com/arcbees/chosen/client/DesktopMultipleChosenImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014 ArcBees Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -17,7 +17,6 @@
 package com.arcbees.chosen.client;
 
 import com.arcbees.chosen.client.SelectParser.OptionItem;
-import com.arcbees.chosen.client.event.ChosenChangeEvent;
 import com.arcbees.chosen.client.event.MaxSelectedEvent;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.RepeatingCommand;
@@ -182,9 +181,7 @@ protected void onResultSelected(OptionItem item, String newValue, String oldValu
             resultsHide();
         }
 
-        if (oldValue == null || !oldValue.equals(newValue)) {
-            fireEvent(new ChosenChangeEvent(newValue, item.getArrayIndex(), this));
-        }
+        fireChosenChangeEventIfNotEqual(item, newValue, oldValue);
     }
 
     @Override
diff --git a/plugin/src/main/java/com/arcbees/chosen/client/MobileMultipleChosenImpl.java b/plugin/src/main/java/com/arcbees/chosen/client/MobileMultipleChosenImpl.java
index 1364b23..c9a0aa6 100644
--- a/plugin/src/main/java/com/arcbees/chosen/client/MobileMultipleChosenImpl.java
+++ b/plugin/src/main/java/com/arcbees/chosen/client/MobileMultipleChosenImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014 ArcBees Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -17,7 +17,6 @@
 package com.arcbees.chosen.client;
 
 import com.arcbees.chosen.client.SelectParser.OptionItem;
-import com.arcbees.chosen.client.event.ChosenChangeEvent;
 import com.arcbees.chosen.client.event.MaxSelectedEvent;
 import com.google.gwt.dom.client.OptionElement;
 import com.google.gwt.query.client.GQuery;
@@ -78,9 +77,14 @@ protected void resultSelect(Event e) {
 
     @Override
     protected void onResultSelected(OptionItem item, String newValue, String oldValue, boolean metaKeyPressed) {
-        if (oldValue == null || !oldValue.equals(newValue)) {
-            fireEvent(new ChosenChangeEvent(newValue, item.getArrayIndex(), this));
-        }
+        fireChosenChangeEventIfNotEqual(item, newValue, oldValue);
+    }
+
+    @Override
+    protected void update() {
+        super.update();
+
+        closeField();
     }
 
     private void resultDeselect(OptionItem item, GQuery element) {
@@ -106,9 +110,9 @@ protected void resultsHide() {
     private void updateSelectedText() {
         String selectedText;
         if (choices > 1) {
-            selectedText =  getOptions().getManySelectedTextMultipleMobile();
+            selectedText = getOptions().getManySelectedTextMultipleMobile();
         } else {
-            selectedText =  getOptions().getOneSelectedTextMultipleMobile();
+            selectedText = getOptions().getOneSelectedTextMultipleMobile();
         }
 
         selectedText = selectedText.replace("{}", "" + choices);
diff --git a/plugin/src/main/java/com/arcbees/chosen/client/MobileSingleChosenImpl.java b/plugin/src/main/java/com/arcbees/chosen/client/MobileSingleChosenImpl.java
index 28abf89..b5e609d 100644
--- a/plugin/src/main/java/com/arcbees/chosen/client/MobileSingleChosenImpl.java
+++ b/plugin/src/main/java/com/arcbees/chosen/client/MobileSingleChosenImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014 ArcBees Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -16,10 +16,13 @@
 
 package com.arcbees.chosen.client;
 
+import com.arcbees.chosen.client.SelectParser.OptionItem;
+
 public class MobileSingleChosenImpl extends AbstractMobileChosenImpl {
     @Override
-    protected void onResultSelected(SelectParser.OptionItem item, String newValue, String oldValue,
-            boolean metaKeyPressed) {
+    protected void onResultSelected(OptionItem item, String newValue, String oldValue, boolean metaKeyPressed) {
+        fireChosenChangeEventIfNotEqual(item, newValue, oldValue);
+
         closeField();
     }
 }
diff --git a/plugin/src/main/java/com/arcbees/chosen/client/gwt/BaseChosenValueListBox.java b/plugin/src/main/java/com/arcbees/chosen/client/gwt/BaseChosenValueListBox.java
index d1b4c47..7092157 100644
--- a/plugin/src/main/java/com/arcbees/chosen/client/gwt/BaseChosenValueListBox.java
+++ b/plugin/src/main/java/com/arcbees/chosen/client/gwt/BaseChosenValueListBox.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 ArcBees Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
diff --git a/pom.xml b/pom.xml
index e95bb4d..2ead0b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -75,14 +76,14 @@
         <arcbees-checkstyle.version>1.2</arcbees-checkstyle.version>
 
         <!-- maven -->
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <target.jdk>1.6</target.jdk>
         <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
         <maven-surefire-plugin.version>2.12</maven-surefire-plugin.version>
         <maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version>
         <jetty-maven-plugin.version>9.3.0.M1</jetty-maven-plugin.version>
         <maven-site-plugin.version>3.3</maven-site-plugin.version>
         <maven-checkstyle-plugin.version>2.16</maven-checkstyle-plugin.version>
+        <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
         <port-allocator-maven-plugin.version>1.2</port-allocator-maven-plugin.version>
         <testutils.version>1.2</testutils.version>
 
@@ -101,6 +102,7 @@
 
         <gwt.loglevel>INFO</gwt.loglevel>
         <gwt.outputstyle>OBF</gwt.outputstyle>
+        <webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
     </properties>
 
     <modules>
@@ -154,6 +156,17 @@
                 <version>${gwt.version}</version>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${target.jdk}</source>
+                    <target>${target.jdk}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
@@ -286,12 +299,6 @@
             <version>${gwt.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.gwt</groupId>
-            <artifactId>gwt-codeserver</artifactId>
-            <version>${gwt.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.googlecode.gwtquery</groupId>
             <artifactId>gwtquery</artifactId>
diff --git a/release/gwtchosen-1.0.1.jar b/release/gwtchosen-1.0.1.jar
deleted file mode 100644
index 8865b0c..0000000
Binary files a/release/gwtchosen-1.0.1.jar and /dev/null differ
diff --git a/release/gwtchosen-1.0.2-snapshot.jar b/release/gwtchosen-1.0.2-snapshot.jar
deleted file mode 100644
index 1b59a21..0000000
Binary files a/release/gwtchosen-1.0.2-snapshot.jar and /dev/null differ
diff --git a/release/gwtchosen-1.0.3-snapshot.jar b/release/gwtchosen-1.0.3-snapshot.jar
deleted file mode 100644
index e8ccbf4..0000000
Binary files a/release/gwtchosen-1.0.3-snapshot.jar and /dev/null differ
diff --git a/sample/pom.xml b/sample/pom.xml
index 1583ee3..15e2f6e 100644
--- a/sample/pom.xml
+++ b/sample/pom.xml
@@ -12,7 +12,6 @@
     <packaging>war</packaging>
 
     <properties>
-        <webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
         <gsss.version>1.1</gsss.version>
         <gwtp.version>1.4</gwtp.version>
         <guice.version>3.0</guice.version>