diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java
index cc55d0503..d6cafffaa 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/AbstractCouchbaseConverter.java
@@ -17,6 +17,7 @@
 package org.springframework.data.couchbase.core.convert;
 
 import java.util.Collections;
+import java.util.Optional;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.convert.ConversionService;
@@ -100,7 +101,8 @@ public Object convertForWriteIfNeeded(Object value) {
 
 		return this.conversions.getCustomWriteTarget(value.getClass()) //
 				.map(it -> (Object) this.conversionService.convert(value, it)) //
-				.orElse(value);
+				.orElseGet(() -> Enum.class.isAssignableFrom(value.getClass()) ? ((Enum<?>) value).name() : value);
+
 	}
 
 	@Override
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
index e84055707..7793be558 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
+++ b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
@@ -774,15 +774,8 @@ private void writeSimpleInternal(final Object source, final CouchbaseDocument ta
 		target.put(key, getPotentiallyConvertedSimpleWrite(source));
 	}
 
-	private Object getPotentiallyConvertedSimpleWrite(final Object value) {
-		if (value == null) {
-			return null;
-		}
-
-		Optional<Class<?>> customTarget = conversions.getCustomWriteTarget(value.getClass());
-
-		return customTarget.map(it -> (Object) conversionService.convert(value, it))
-				.orElseGet(() -> Enum.class.isAssignableFrom(value.getClass()) ? ((Enum<?>) value).name() : value);
+	public Object getPotentiallyConvertedSimpleWrite(final Object value) {
+		return convertForWriteIfNeeded(value);
 	}
 
 	/**
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java b/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java
index 7f1305812..4b7da2459 100644
--- a/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java
+++ b/src/main/java/org/springframework/data/couchbase/core/query/QueryCriteria.java
@@ -192,6 +192,13 @@ public QueryCriteria containing(@Nullable Object o) {
 		return this;
 	}
 
+	public QueryCriteria arrayContaining(@Nullable Object o) {
+		operator = "ARRAY_CONTAINING";
+		value = new Object[] { o };
+		format = "array_containing(%1$s, %3$s)";
+		return this;
+	}
+
 	public QueryCriteria notContaining(@Nullable Object o) {
 		value = new QueryCriteria[] { wrap(containing(o)) };
 		operator = "NOT";
diff --git a/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java b/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java
index ca1e06afd..cc563e015 100644
--- a/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/query/QueryCriteriaTests.java
@@ -123,14 +123,11 @@ void testStartingWith() {
 		assertEquals("`name` like (\"Cou\"||\"%\")", c.export());
 	}
 
-	/* cannot do this properly yet because in arg to when() in
-	       * startingWith()  cannot be a QueryCriteria
 	@Test
 	void testStartingWithExpr() {
 		QueryCriteria c = where(i("name")).startingWith(where(i("name")).plus("xxx"));
-		assertEquals("`name` like (((`name` || "xxx") || ""%""))", c.export());
+		assertEquals("`name` like (((`name` || \"xxx\"))||\"%\")", c.export());
 	}
-	      */
 
 	@Test
 	void testEndingWith() {
@@ -162,6 +159,12 @@ void testNotContaining() {
 		assertEquals("not( (contains(`name`, \"Elvis\")) )", c.export());
 	}
 
+	@Test
+	void testArrayContaining() {
+		QueryCriteria c = where(i("name")).arrayContaining("Elvis");
+		assertEquals("array_containing(`name`, \"Elvis\")", c.export());
+	}
+
 	@Test
 	void testLike() {
 		QueryCriteria c = where(i("name")).like("%ouch%");
diff --git a/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java b/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java
index 911aebd70..1b04222f9 100644
--- a/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java
+++ b/src/test/java/org/springframework/data/couchbase/domain/AirportRepository.java
@@ -50,6 +50,9 @@ public interface AirportRepository extends PagingAndSortingRepository<Airport, S
 	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
 	Airport findByIata(String iata);
 
+	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
+	Airport findByIata(Iata iata);
+
 	@Query("#{#n1ql.selectEntity} where iata = $1")
 	@ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
 	List<Airport> getAllByIata(String iata);
diff --git a/src/test/java/org/springframework/data/couchbase/domain/Iata.java b/src/test/java/org/springframework/data/couchbase/domain/Iata.java
new file mode 100644
index 000000000..5e603005c
--- /dev/null
+++ b/src/test/java/org/springframework/data/couchbase/domain/Iata.java
@@ -0,0 +1,6 @@
+package org.springframework.data.couchbase.domain;
+
+public enum Iata {
+  vie,
+  xxx
+}
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
index db9f53fc9..f0d17add4 100644
--- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
+++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
@@ -47,6 +47,7 @@
 import org.springframework.data.couchbase.domain.Address;
 import org.springframework.data.couchbase.domain.Airport;
 import org.springframework.data.couchbase.domain.AirportRepository;
+import org.springframework.data.couchbase.domain.Iata;
 import org.springframework.data.couchbase.domain.Person;
 import org.springframework.data.couchbase.domain.PersonRepository;
 import org.springframework.data.couchbase.domain.User;
@@ -167,6 +168,18 @@ void findBySimpleProperty() {
 		}
 	}
 
+	@Test
+	void findByEnum() {
+		Airport vie = null;
+		try {
+			vie = new Airport("airports::vie", "vie", "loww");
+			vie = airportRepository.save(vie);
+			Airport airport2 = airportRepository.findByIata(Iata.vie);
+			assertEquals(airport2.getId(), vie.getId());
+		} finally {
+			airportRepository.delete(vie);
+		}
+	}
 	@Test
 	public void testCas() {
 		User user = new User("1", "Dave", "Wilson");