diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeDt.java
index 515a9d0a214..d8de65f25e8 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeDt.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/BoundCodeDt.java
@@ -37,25 +37,20 @@ public class BoundCodeDt<T extends Enum<?>> extends CodeDt {
 	public BoundCodeDt() {
 		// nothing
 	}
-	
+
 	public BoundCodeDt(IValueSetEnumBinder<T> theBinder) {
 		Validate.notNull(theBinder, "theBinder must not be null");
 		myBinder = theBinder;
 	}
-
+	
 	public BoundCodeDt(IValueSetEnumBinder<T> theBinder, T theValue) {
 		Validate.notNull(theBinder, "theBinder must not be null");
 		myBinder = theBinder;
 		setValueAsEnum(theValue);
 	}
 
-	public void setValueAsEnum(T theValue) {
-		Validate.notNull(myBinder, "This object does not have a binder. Constructor BoundCodeDt() should not be called!");
-		if (theValue==null) {
-			setValue(null);
-		} else {
-			setValue(myBinder.toCodeString(theValue));
-		}
+	public IValueSetEnumBinder<T> getBinder() {
+		return myBinder;
 	}
 
 	public T getValueAsEnum() {
@@ -66,4 +61,13 @@ public class BoundCodeDt<T extends Enum<?>> extends CodeDt {
 		}
 		return retVal;
 	}
+
+	public void setValueAsEnum(T theValue) {
+		Validate.notNull(myBinder, "This object does not have a binder. Constructor BoundCodeDt() should not be called!");
+		if (theValue==null) {
+			setValue(null);
+		} else {
+			setValue(myBinder.toCodeString(theValue));
+		}
+	}
 }
diff --git a/hapi-fhir-jpaserver-base/.classpath b/hapi-fhir-jpaserver-base/.classpath
index 845e0284061..dcca171a6c6 100644
--- a/hapi-fhir-jpaserver-base/.classpath
+++ b/hapi-fhir-jpaserver-base/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/test/java">
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="src" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu2.java
index b8bede8cb10..75175161ab4 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu2.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu2.java
@@ -52,6 +52,7 @@ import ca.uhn.fhir.jpa.entity.ResourceTable;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.model.api.IPrimitiveDatatype;
 import ca.uhn.fhir.model.api.IResource;
+import ca.uhn.fhir.model.api.IValueSetEnumBinder;
 import ca.uhn.fhir.model.base.composite.BaseHumanNameDt;
 import ca.uhn.fhir.model.dstu2.composite.AddressDt;
 import ca.uhn.fhir.model.dstu2.composite.BoundCodeableConceptDt;
@@ -71,6 +72,7 @@ import ca.uhn.fhir.model.dstu2.resource.Questionnaire;
 import ca.uhn.fhir.model.dstu2.resource.ValueSet;
 import ca.uhn.fhir.model.dstu2.valueset.RestfulSecurityServiceEnum;
 import ca.uhn.fhir.model.primitive.BaseDateTimeDt;
+import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.IntegerDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.model.primitive.UriDt;
@@ -79,7 +81,7 @@ import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum;
 public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implements ISearchParamExtractor {
 
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SearchParamExtractorDstu2.class);
-	
+
 	public SearchParamExtractorDstu2(FhirContext theContext) {
 		super(theContext);
 	}
@@ -115,7 +117,8 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see ca.uhn.fhir.jpa.dao.ISearchParamExtractor#extractSearchParamDates(ca.uhn.fhir.jpa.entity.ResourceTable, ca.uhn.fhir.model.api.IResource)
+	 * @see ca.uhn.fhir.jpa.dao.ISearchParamExtractor#extractSearchParamDates(ca.uhn.fhir.jpa.entity.ResourceTable,
+	 * ca.uhn.fhir.model.api.IResource)
 	 */
 	@Override
 	public Set<ResourceIndexedSearchParamDate> extractSearchParamDates(ResourceTable theEntity, IResource theResource) {
@@ -175,7 +178,8 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see ca.uhn.fhir.jpa.dao.ISearchParamExtractor#extractSearchParamNumber(ca.uhn.fhir.jpa.entity.ResourceTable, ca.uhn.fhir.model.api.IResource)
+	 * @see ca.uhn.fhir.jpa.dao.ISearchParamExtractor#extractSearchParamNumber(ca.uhn.fhir.jpa.entity.ResourceTable,
+	 * ca.uhn.fhir.model.api.IResource)
 	 */
 	@Override
 	public HashSet<ResourceIndexedSearchParamNumber> extractSearchParamNumber(ResourceTable theEntity, IResource theResource) {
@@ -222,12 +226,17 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 							nextValue = newValue;
 
 							/*
-							 * @SuppressWarnings("unchecked") PhysicsUnit<? extends org.unitsofmeasurement.quantity.Quantity<?>> unit = (PhysicsUnit<? extends org.unitsofmeasurement.quantity.Quantity<?>>)
-							 * UCUMFormat.getCaseInsensitiveInstance().parse(nextValue.getCode().getValue(), null); if (unit.isCompatible(UCUM.DAY)) {
+							 * @SuppressWarnings("unchecked") PhysicsUnit<? extends
+							 * org.unitsofmeasurement.quantity.Quantity<?>> unit = (PhysicsUnit<? extends
+							 * org.unitsofmeasurement.quantity.Quantity<?>>)
+							 * UCUMFormat.getCaseInsensitiveInstance().parse(nextValue.getCode().getValue(), null); if
+							 * (unit.isCompatible(UCUM.DAY)) {
 							 * 
-							 * @SuppressWarnings("unchecked") PhysicsUnit<org.unitsofmeasurement.quantity.Time> timeUnit = (PhysicsUnit<Time>) unit; UnitConverter conv = timeUnit.getConverterTo(UCUM.DAY);
-							 * double dayValue = conv.convert(nextValue.getValue().getValue().doubleValue()); DurationDt newValue = new DurationDt(); newValue.setSystem(UCUM_NS);
-							 * newValue.setCode(UCUM.DAY.getSymbol()); newValue.setValue(dayValue); nextValue=newValue; }
+							 * @SuppressWarnings("unchecked") PhysicsUnit<org.unitsofmeasurement.quantity.Time> timeUnit =
+							 * (PhysicsUnit<Time>) unit; UnitConverter conv = timeUnit.getConverterTo(UCUM.DAY); double
+							 * dayValue = conv.convert(nextValue.getValue().getValue().doubleValue()); DurationDt newValue =
+							 * new DurationDt(); newValue.setSystem(UCUM_NS); newValue.setCode(UCUM.DAY.getSymbol());
+							 * newValue.setValue(dayValue); nextValue=newValue; }
 							 */
 						}
 					}
@@ -269,7 +278,8 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see ca.uhn.fhir.jpa.dao.ISearchParamExtractor#extractSearchParamQuantity(ca.uhn.fhir.jpa.entity.ResourceTable, ca.uhn.fhir.model.api.IResource)
+	 * @see ca.uhn.fhir.jpa.dao.ISearchParamExtractor#extractSearchParamQuantity(ca.uhn.fhir.jpa.entity.ResourceTable,
+	 * ca.uhn.fhir.model.api.IResource)
 	 */
 	@Override
 	public Set<ResourceIndexedSearchParamQuantity> extractSearchParamQuantity(ResourceTable theEntity, IResource theResource) {
@@ -303,8 +313,7 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 						continue;
 					}
 
-					ResourceIndexedSearchParamQuantity nextEntity = new ResourceIndexedSearchParamQuantity(resourceName, nextValue.getValueElement().getValue(),
-							nextValue.getSystemElement().getValueAsString(), nextValue.getCode());
+					ResourceIndexedSearchParamQuantity nextEntity = new ResourceIndexedSearchParamQuantity(resourceName, nextValue.getValueElement().getValue(), nextValue.getSystemElement().getValueAsString(), nextValue.getCode());
 					nextEntity.setResource(theEntity);
 					retVal.add(nextEntity);
 				} else {
@@ -323,7 +332,8 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see ca.uhn.fhir.jpa.dao.ISearchParamExtractor#extractSearchParamStrings(ca.uhn.fhir.jpa.entity.ResourceTable, ca.uhn.fhir.model.api.IResource)
+	 * @see ca.uhn.fhir.jpa.dao.ISearchParamExtractor#extractSearchParamStrings(ca.uhn.fhir.jpa.entity.ResourceTable,
+	 * ca.uhn.fhir.model.api.IResource)
 	 */
 	@Override
 	public Set<ResourceIndexedSearchParamString> extractSearchParamStrings(ResourceTable theEntity, IResource theResource) {
@@ -404,7 +414,8 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see ca.uhn.fhir.jpa.dao.ISearchParamExtractor#extractSearchParamTokens(ca.uhn.fhir.jpa.entity.ResourceTable, ca.uhn.fhir.model.api.IResource)
+	 * @see ca.uhn.fhir.jpa.dao.ISearchParamExtractor#extractSearchParamTokens(ca.uhn.fhir.jpa.entity.ResourceTable,
+	 * ca.uhn.fhir.model.api.IResource)
 	 */
 	@Override
 	public Set<BaseResourceIndexedSearchParam> extractSearchParamTokens(ResourceTable theEntity, IResource theResource) {
@@ -464,11 +475,11 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 						systems.add(system);
 						codes.add(value);
 					}
-					
+
 					if (isNotBlank(nextValue.getType().getText())) {
 						addStringParam(theEntity, retVal, nextSpDef, nextValue.getType().getText());
 					}
-					
+
 				} else if (nextObject instanceof ContactPointDt) {
 					ContactPointDt nextValue = (ContactPointDt) nextObject;
 					if (nextValue.isEmpty()) {
@@ -481,6 +492,14 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 					}
 					systems.add(nextValue.getSystemElement().getValueAsString());
 					codes.add(nextValue.getValueElement().getValue());
+				} else if (nextObject instanceof BoundCodeDt) {
+					BoundCodeDt<?> obj = (BoundCodeDt<?>) nextObject;
+					String system = extractSystem(obj);
+					String code = obj.getValue();
+					if (isNotBlank(code)) {
+						systems.add(system);
+						codes.add(code);
+					}
 				} else if (nextObject instanceof IPrimitiveDatatype<?>) {
 					IPrimitiveDatatype<?> nextValue = (IPrimitiveDatatype<?>) nextObject;
 					if (nextValue.isEmpty()) {
@@ -503,7 +522,8 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 
 					extractTokensFromCodeableConcept(systems, codes, nextCC, theEntity, retVal, nextSpDef);
 				} else if (nextObject instanceof RestSecurity) {
-					// Conformance.security search param points to something kind of useless right now - This should probably be fixed.
+					// Conformance.security search param points to something kind of useless right now - This should probably
+					// be fixed.
 					RestSecurity sec = (RestSecurity) nextObject;
 					for (BoundCodeableConceptDt<RestfulSecurityServiceEnum> nextCC : sec.getService()) {
 						extractTokensFromCodeableConcept(systems, codes, nextCC, theEntity, retVal, nextSpDef);
@@ -588,9 +608,9 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 					}
 
 					ourLog.trace("Adding param: {}, {}", resourceName, nextValue.getValue());
-					
+
 					ResourceIndexedSearchParamUri nextEntity = new ResourceIndexedSearchParamUri(resourceName, nextValue.getValue());
-					
+
 					nextEntity.setResource(theEntity);
 					retVal.add(nextEntity);
 				} else {
@@ -605,17 +625,14 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 
 		return retVal;
 	}
-	
-	
-	private void extractTokensFromCodeableConcept(List<String> theSystems, List<String> theCodes, CodeableConceptDt theCodeableConcept, ResourceTable theEntity,
-			Set<BaseResourceIndexedSearchParam> theListToPopulate, RuntimeSearchParam theParameterDef) {
+
+	private void extractTokensFromCodeableConcept(List<String> theSystems, List<String> theCodes, CodeableConceptDt theCodeableConcept, ResourceTable theEntity, Set<BaseResourceIndexedSearchParam> theListToPopulate, RuntimeSearchParam theParameterDef) {
 		for (CodingDt nextCoding : theCodeableConcept.getCoding()) {
 			extractTokensFromCoding(theSystems, theCodes, theEntity, theListToPopulate, theParameterDef, nextCoding);
 		}
 	}
 
-	private void extractTokensFromCoding(List<String> theSystems, List<String> theCodes, ResourceTable theEntity, Set<BaseResourceIndexedSearchParam> theListToPopulate,
-			RuntimeSearchParam theParameterDef, CodingDt nextCoding) {
+	private void extractTokensFromCoding(List<String> theSystems, List<String> theCodes, ResourceTable theEntity, Set<BaseResourceIndexedSearchParam> theListToPopulate, RuntimeSearchParam theParameterDef, CodingDt nextCoding) {
 		if (nextCoding != null && !nextCoding.isEmpty()) {
 
 			String nextSystem = nextCoding.getSystemElement().getValueAsString();
@@ -632,4 +649,12 @@ public class SearchParamExtractorDstu2 extends BaseSearchParamExtractor implemen
 		}
 	}
 
+	private static <T extends Enum<?>> String extractSystem(BoundCodeDt<T> theBoundCode) {
+		if (theBoundCode.getValueAsEnum() != null) {
+			IValueSetEnumBinder<T> binder = theBoundCode.getBinder();
+			return binder.toSystemString(theBoundCode.getValueAsEnum());
+		}
+		return null;
+	}
+
 }
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java
index 76d37f00394..e94f476224f 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java
@@ -8,6 +8,8 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.junit.AfterClass;
 
+import ca.uhn.fhir.model.dstu2.resource.Bundle;
+import ca.uhn.fhir.model.dstu2.resource.Bundle.Entry;
 import ca.uhn.fhir.rest.server.IBundleProvider;
 
 public class BaseJpaTest {
@@ -35,6 +37,16 @@ public class BaseJpaTest {
 		return retVal;
 	}
 
+	protected List<IIdType> toUnqualifiedVersionlessIds(Bundle theFound) {
+		List<IIdType> retVal = new ArrayList<IIdType>();
+		for (Entry next : theFound.getEntry()) {
+//			if (next.getResource()!= null) {
+				retVal.add(next.getResource().getId().toUnqualifiedVersionless());
+//			}
+		}
+		return retVal;
+	}
+
 	protected List<IIdType> toUnqualifiedVersionlessIds(List<IBaseResource> theFound) {
 		List<IIdType> retVal = new ArrayList<IIdType>();
 		for (IBaseResource next : theFound) {
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2SearchTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2SearchTest.java
index 8bf241731ec..068fadd662b 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2SearchTest.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoDstu2SearchTest.java
@@ -56,9 +56,12 @@ import ca.uhn.fhir.model.dstu2.resource.Observation;
 import ca.uhn.fhir.model.dstu2.resource.Organization;
 import ca.uhn.fhir.model.dstu2.resource.Patient;
 import ca.uhn.fhir.model.dstu2.resource.Practitioner;
+import ca.uhn.fhir.model.dstu2.resource.Subscription;
 import ca.uhn.fhir.model.dstu2.resource.Substance;
 import ca.uhn.fhir.model.dstu2.resource.ValueSet;
 import ca.uhn.fhir.model.dstu2.valueset.ContactPointSystemEnum;
+import ca.uhn.fhir.model.dstu2.valueset.SubscriptionChannelTypeEnum;
+import ca.uhn.fhir.model.dstu2.valueset.SubscriptionStatusEnum;
 import ca.uhn.fhir.model.primitive.CodeDt;
 import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
@@ -100,6 +103,19 @@ public class FhirResourceDaoDstu2SearchTest extends BaseJpaDstu2Test {
 		assertEquals(0, results.size());
 	}
 	
+	@Test
+	public void testCodeSearch() {
+		Subscription subs = new Subscription();
+		subs.setStatus(SubscriptionStatusEnum.ACTIVE);
+		subs.getChannel().setType(SubscriptionChannelTypeEnum.WEBSOCKET);
+		subs.setCriteria("Observation?");
+		IIdType id = mySubscriptionDao.create(subs).getId().toUnqualifiedVersionless();
+		
+		SearchParameterMap map = new SearchParameterMap();
+		map.add(Subscription.SP_TYPE, new TokenParam(null, SubscriptionChannelTypeEnum.WEBSOCKET.getCode()));
+		map.add(Subscription.SP_STATUS, new TokenParam(null, SubscriptionStatusEnum.ACTIVE.getCode()));
+		assertThat(toUnqualifiedVersionlessIds(mySubscriptionDao.search(map)), contains(id));
+	}
 	
 	@Test
 	public void testIndexNoDuplicatesString() {
diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java
index abc0bb18274..25a25cff4ce 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/ResourceProviderDstu2Test.java
@@ -4,6 +4,7 @@ import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsInRelativeOrder;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasItems;
 import static org.hamcrest.Matchers.not;
@@ -69,12 +70,15 @@ import ca.uhn.fhir.model.dstu2.resource.Parameters;
 import ca.uhn.fhir.model.dstu2.resource.Patient;
 import ca.uhn.fhir.model.dstu2.resource.Questionnaire;
 import ca.uhn.fhir.model.dstu2.resource.QuestionnaireResponse;
+import ca.uhn.fhir.model.dstu2.resource.Subscription;
 import ca.uhn.fhir.model.dstu2.resource.ValueSet;
 import ca.uhn.fhir.model.dstu2.valueset.AnswerFormatEnum;
 import ca.uhn.fhir.model.dstu2.valueset.EncounterClassEnum;
 import ca.uhn.fhir.model.dstu2.valueset.EncounterStateEnum;
 import ca.uhn.fhir.model.dstu2.valueset.HTTPVerbEnum;
 import ca.uhn.fhir.model.dstu2.valueset.SearchEntryModeEnum;
+import ca.uhn.fhir.model.dstu2.valueset.SubscriptionChannelTypeEnum;
+import ca.uhn.fhir.model.dstu2.valueset.SubscriptionStatusEnum;
 import ca.uhn.fhir.model.primitive.DateDt;
 import ca.uhn.fhir.model.primitive.DateTimeDt;
 import ca.uhn.fhir.model.primitive.IdDt;
@@ -104,6 +108,53 @@ public class ResourceProviderDstu2Test extends BaseResourceProviderDstu2Test {
 		assertEquals(200, resp.getStatusLine().getStatusCode());
 	}
 
+	@Test
+	public void testCodeSearch() {
+		Subscription subs = new Subscription();
+		subs.setStatus(SubscriptionStatusEnum.ACTIVE);
+		subs.getChannel().setType(SubscriptionChannelTypeEnum.WEBSOCKET);
+		subs.setCriteria("Observation?");
+		IIdType id = ourClient.create().resource(subs).execute().getId().toUnqualifiedVersionless();
+		
+		//@formatter:off
+		ca.uhn.fhir.model.dstu2.resource.Bundle resp = ourClient
+			.search()
+			.forResource(Subscription.class)
+			.where(Subscription.TYPE.exactly().code(SubscriptionChannelTypeEnum.WEBSOCKET.getCode()))
+			.and(Subscription.STATUS.exactly().code(SubscriptionStatusEnum.ACTIVE.getCode()))
+			.returnBundle(ca.uhn.fhir.model.dstu2.resource.Bundle.class)
+			.execute();
+		//@formatter:off
+
+		assertThat(toUnqualifiedVersionlessIds(resp), contains(id));
+		
+		//@formatter:off
+		resp = ourClient
+			.search()
+			.forResource(Subscription.class)
+			.where(Subscription.TYPE.exactly().systemAndCode(SubscriptionChannelTypeEnum.WEBSOCKET.getSystem(), SubscriptionChannelTypeEnum.WEBSOCKET.getCode()))
+			.and(Subscription.STATUS.exactly().systemAndCode(SubscriptionStatusEnum.ACTIVE.getSystem(), SubscriptionStatusEnum.ACTIVE.getCode()))
+			.returnBundle(ca.uhn.fhir.model.dstu2.resource.Bundle.class)
+			.execute();
+		//@formatter:off
+
+		assertThat(toUnqualifiedVersionlessIds(resp), contains(id));
+
+		//@formatter:off
+		resp = ourClient
+			.search()
+			.forResource(Subscription.class)
+			.where(Subscription.TYPE.exactly().systemAndCode(SubscriptionChannelTypeEnum.WEBSOCKET.getSystem(), SubscriptionChannelTypeEnum.WEBSOCKET.getCode()))
+			.and(Subscription.STATUS.exactly().systemAndCode("foo", SubscriptionStatusEnum.ACTIVE.getCode()))
+			.returnBundle(ca.uhn.fhir.model.dstu2.resource.Bundle.class)
+			.execute();
+		//@formatter:off
+
+		assertThat(toUnqualifiedVersionlessIds(resp), empty());
+
+	}
+
+	
 	// private void delete(String theResourceType, String theParamName, String theParamValue) {
 	// Bundle resources;
 	// do {
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/mvc/SubscriptionPlaygroundController.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/mvc/SubscriptionPlaygroundController.java
index 993f5f87cc7..134409888cd 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/mvc/SubscriptionPlaygroundController.java
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/mvc/SubscriptionPlaygroundController.java
@@ -1,10 +1,19 @@
 package ca.uhn.fhirtest.mvc;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import ca.uhn.fhir.model.dstu2.resource.Bundle;
+import ca.uhn.fhir.model.dstu2.resource.Bundle.Entry;
+import ca.uhn.fhir.model.dstu2.resource.Subscription;
+import ca.uhn.fhir.model.dstu2.valueset.SubscriptionChannelTypeEnum;
+import ca.uhn.fhir.model.dstu2.valueset.SubscriptionStatusEnum;
+import ca.uhn.fhir.rest.client.GenericClient;
 import ca.uhn.fhir.to.BaseController;
 import ca.uhn.fhir.to.model.HomeRequest;
 
@@ -21,6 +30,28 @@ public class SubscriptionPlaygroundController extends BaseController {
 
 		ourLog.info(logPrefix(theModel) + "Displayed subscriptions playground page");
 
+		CaptureInterceptor interceptor = new CaptureInterceptor();
+		GenericClient client = theRequest.newClient(theServletRequest, getContext(theRequest), myConfig, interceptor);
+
+		//@formatter:off
+		Bundle resp = client
+			.search()
+			.forResource(Subscription.class)
+			.where(Subscription.TYPE.exactly().code(SubscriptionChannelTypeEnum.WEBSOCKET.getCode()))
+			.and(Subscription.STATUS.exactly().code(SubscriptionStatusEnum.ACTIVE.getCode()))
+			.returnBundle(Bundle.class)
+			.execute();
+		//@formatter:off
+		
+		List<Subscription> subscriptions = new ArrayList<Subscription>();
+		for (Entry next : resp.getEntry()) {
+			if (next.getResource() instanceof Subscription) {
+				subscriptions.add((Subscription) next.getResource());
+			}
+		}
+		
+		theModel.put("subscriptions", subscriptions);
+		
 		return "subscriptions";
 	}
 
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/subscriptions.html b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/subscriptions.html
index 1d06bee5745..0b162c24b2b 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/subscriptions.html
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/subscriptions.html
@@ -36,7 +36,10 @@
 							</div>
 						</div>
 					</div>
-
+					
+					<!-- Subscription Creation -->
+					<div id="subscription_creation">
+					
 								<!-- Nav tabs -->
 								<ul class="nav nav-tabs" role="tablist">
 									<li role="presentation" class="active"><a href="#wss"
@@ -48,33 +51,29 @@
 
 								<!-- Tab panes -->
 								<div class="tab-content">
-									<div role="tabpanel" class="tab-pane active" id="wss">...1</div>
+									
+									<!-- Static Websocket -->
+									<div role="tabpanel" class="tab-pane active" id="wss">
+										
+										<table class="table table-striped table-condensed">
+											<tr>
+												<td>ID</td>
+												<td>Criteria</td>
+												<td></td>
+											</tr>
+											<tr th:each="subscription : ${subscriptions}">
+												<td th:text="${subscription.id.toUnqualified()}"/>
+												<td th:text="${subscription.criteria}"/>
+												<td>
+													<button type="button" class="btn btn-default btn-primary btn-block" id="dws_create" th:onclick="'dwsCreate(\'' + ${subscription.id.getIdPart()} + '\');'"><i class="glyphicon glyphicon-cog"></i> Subscribe</button>
+												</td>
+											</tr>
+										</table>
+									
+									</div>
 									
 									<!-- Dynamic WebSocket -->
 									<div role="tabpanel" class="tab-pane" id="wsd">
-										<script type="text/javascript">
-										function dwsCreate() {
-											try {
-												var socket = new WebSocket("ws://localhost:8888/websocket/dstu2");
-												alert('Socket Status: '+socket.readyState);
-	
-												socket.onopen = function() {
-													alert("Opening Socket: " + socket.readyState);
-													socket.send("bind Observation?");
-												}
-												socket.onmessage = function(msg) {
-													alert("New message: " + msg);
-												}
-												socket.onerror = function(error) {
-													alert("error: " + error);
-												}
-											} catch (exception) {
-												alert('Error'+exception);
-											}
-											return false;
-										}
-										</script>
-										
 										<div class="row">
 											<div class="col-sm-12">
 												Enter a criteria in the text box below and then click subscribe to
@@ -93,38 +92,84 @@
 												</div>
 											</div>
 											<div class="col-sm-3">
-												<button type="button" class="btn btn-default btn-primary btn-block" id="dws_create" onclick="dwsCreate();"><i class="glyphicon glyphicon-cog"></i> Subscribe</button>
+												<button type="button" class="btn btn-default btn-primary btn-block" id="dws_create" onclick="dwsCreate(document.getElementById('dws_criteria').value, true);"><i class="glyphicon glyphicon-cog"></i> Subscribe</button>
 											</div>
 										</div>
 										
 									</div>
 								</div>
 
-
-					<!-- Dynamic Subscription Results -->
-					<div class="panel panel-default">
+					</div>
+					
+					<!-- Subscription Results -->
+					<div class="panel panel-default" style="display:none;" id="resultsDiv">
 						<div class="panel-heading">Subscription Results</div>
-							<div class="panel-body">
-								<p>
-									This will be status...
-								</p>
-							</div>
-						
-							<!-- List group -->
-							<ul class="list-group">
-								<li class="list-group-item">Cras justo odio</li>
-								<li class="list-group-item">Dapibus ac facilisis in</li>
-								<li class="list-group-item">Morbi leo risus</li>
-								<li class="list-group-item">Porta ac consectetur ac</li>
-								<li class="list-group-item">Vestibulum at eros</li>
+							<ul class="list-group" id="subscription_status_list">
 							</ul>
-						</div>
+					</div>
 					</div>
 
+					<script type="text/javascript">
+					
+					function messageStatus(message) {
+						var listItem = $('<li />', { 'class': 'list-group-item' });
+						listItem.append($('<div class="glyphicon glyphicon-info-sign" style="width: 20px;"/>'));
+						listItem.append($('<span>' + message + '</span>'));
+						$('#subscription_status_list').append(listItem);
+					}
+
+					function messageIn(message, remainder) {
+						var listItem = $('<li />', { 'class': 'list-group-item' });
+						listItem.append($('<div class="glyphicon glyphicon-download" style="width: 20px;"/>'));
+						listItem.append($('<span>' + message + '</span>'));
+						if (remainder) {
+							listItem.append($('<p>(' + remainder + ' bytes)</p>'));
+							listItem.append($('<pre style="display:none;"/>').text(remainder));
+						}
+						$('#subscription_status_list').append(listItem);
+					}
+					
+					function dwsCreate(bindArgument, dynamic) {
+						$('#resultsDiv').css("display","");
+						$('#subscription_creation').hide();
+						try {
+							var url = "ws://fhirtest.uhn.ca/websocket/dstu2";
+							messageStatus("Connecting to: " + url);
+							var socket = new WebSocket(url);
+
+							socket.onopen = function() {
+								messageStatus("Connected to: " + url);
+								$('#subscription_status_list')
+									.append(
+										$('<li />', { 'class': 'list-group-item' })
+											.append($('<div class="glyphicon glyphicon-upload" style="width: 20px;"/>'))
+											.append($('<span>bind ' + bindArgument + '</span>'))
+									);
+								socket.send("bind " + bindArgument);
+							}
+							
+							// This function is called when a new message comes from the server 
+							socket.onmessage = function(msg) {
+								var data = msg.data;
+								var remainder = null;
+								if (data.indexOf('\n') != -1) {
+									data = data.substring(0, data.indexOf('\n'));
+									remainder = data.substring(data.indexOf('\n') + 1);
+								}
+								messageIn(data, remainder);
+							}
+							socket.onerror = function(error) {
+								messageStatus("Error: " + error);
+							}
+						} catch (exception) {
+							messageStatus("Error: " + exception);
+						}
+						return false;
+					}
+					</script>
 
 				</div>
 			</div>
-		</div>
 
 	</form>
 
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java b/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java
index 62f21ce5789..ddf7fbc0931 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/test/java/ca/uhn/fhirtest/UhnFhirTestApp.java
@@ -12,6 +12,9 @@ import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
 import ca.uhn.fhir.model.api.TagList;
 import ca.uhn.fhir.model.dstu.resource.Organization;
 import ca.uhn.fhir.model.dstu.resource.Patient;
+import ca.uhn.fhir.model.dstu2.resource.Subscription;
+import ca.uhn.fhir.model.dstu2.valueset.SubscriptionChannelTypeEnum;
+import ca.uhn.fhir.model.dstu2.valueset.SubscriptionStatusEnum;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.client.IGenericClient;
@@ -21,7 +24,7 @@ public class UhnFhirTestApp {
 	public static void main(String[] args) throws Exception {
 
 		int myPort = 8888;
-		String base = "http://localhost:" + myPort + "/base";
+		String base = "http://localhost:" + myPort + "/baseDstu2";
 		
 		//		new File("target/testdb").mkdirs();
 		System.setProperty("fhir.db.location", "./target/testdb");
@@ -47,13 +50,13 @@ public class UhnFhirTestApp {
 		// base = "http://spark.furore.com/fhir";
 
 		if (true) {
-			FhirContext ctx = new FhirContext();
+			FhirContext ctx = FhirContext.forDstu2();
 			IGenericClient client = ctx.newRestfulGenericClient(base);
 //			client.setLogRequestAndResponse(true);
 
 			Organization o1 = new Organization();
 			o1.getName().setValue("Some Org");
-			MethodOutcome create = client.create(o1);
+			MethodOutcome create = client.create().resource(o1).execute();
 			IdDt orgId = (IdDt) create.getId();
 
 			Patient p1 = new Patient();
@@ -64,11 +67,14 @@ public class UhnFhirTestApp {
 			TagList list = new TagList();
 			list.addTag("http://hl7.org/fhir/tag", "urn:happytag", "This is a happy resource");
 			ResourceMetadataKeyEnum.TAG_LIST.put(p1, list);
-			client.create(p1);
-
-			List<IResource> resources = ctx.newJsonParser().parseBundle(IOUtils.toString(UhnFhirTestApp.class.getResourceAsStream("/bundle.json"))).toListOfResources();
-//			client.transaction().withResources(resources).execute();
+			client.create().resource(p1).execute();
 
+			Subscription subs = new Subscription();
+			subs.setStatus(SubscriptionStatusEnum.ACTIVE);
+			subs.getChannel().setType(SubscriptionChannelTypeEnum.WEBSOCKET);
+			subs.setCriteria("Observation?");
+			client.create().resource(subs).execute();
+			
 //			for (int i = 0; i < 1000; i++) {
 //				
 //				Patient p = (Patient) resources.get(0);
@@ -78,22 +84,22 @@ public class UhnFhirTestApp {
 //				client.transaction(resources);
 //			}
 
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
-			client.create(p1);
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
+			client.create().resource(p1).execute();
 
-			client.create(p1);
+			client.create().resource(p1).execute();
 
 		}
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index ffa49712e0f..a518735bb5e 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -106,6 +106,11 @@
 				did not have latest valueset definitions applied. Thanks
 				to Bill de Beaubien for reporting!
 			</action>
+			<action type="fix">
+				JPA server can now successfully search for tokens pointing at code values
+				(values with no explicit system but an implied one, such as Patient.gender)
+				even if the system is supplied in the query.
+			</action>
 		</release>
 		<release version="1.2" date="2015-09-18">
 			<action type="add">