diff --git a/nirc_ehr/resources/data/observation_types.tsv b/nirc_ehr/resources/data/observation_types.tsv
index 23451741..d79b197c 100644
--- a/nirc_ehr/resources/data/observation_types.tsv
+++ b/nirc_ehr/resources/data/observation_types.tsv
@@ -1,5 +1,5 @@
 value	category	editorconfig	schemaName	queryName	valueColumn
-Abdominal Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"abdominal_obs_type","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	abdominal_obs_type	value
+Abdominal Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"abdominal_obs_types","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	abdominal_obs_types	value
 Abnormal Behaviors	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"behavior_types","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	behavior_types	value
 Activity		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"activity","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	activity	value
 Alopecia Regrowth	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"alopecia_regrowth","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	alopecia_regrowth	value
@@ -11,38 +11,39 @@ Auscultation		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":
 Bandage/Splint Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"bandage_observations","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	bandage_observations	value
 BCS		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"bcs_score","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	bcs_score	value
 Behavior Abnormality		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"behavior_abnormality","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	behavior_abnormality	value
-Behavior Managment	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"behavior_mgmt_codes","forceSelection":true,"displayField":"title","valueField":"value","sortFields":"sort_order"}	ehr_lookups	behavior_mgmt_codes	value
+Behavior Management	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"behavior_mgmt_codes","forceSelection":true,"displayField":"title","valueField":"value","sortFields":"sort_order"}	ehr_lookups	behavior_mgmt_codes	value
 Capillary Refill Time		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"capillary_refill_time","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	capillary_refill_time	value
 Daily Enrichment	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"daily_enrich_codes","forceSelection":true,"displayField":"title","valueField":"value","sortFields":"sort_order"}	ehr_lookups	daily_enrich_codes	value
 Dental/Oral Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"dental_obs","displayField":"value","sortFields":"sort_order","valueField":"value"}	ehr_lookups	dental_obs	value
 Dermatologic Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"derm_obs","displayField":"value","sortFields":"sort_order","valueField":"value"}	ehr_lookups	derm_obs	value
 Environmental Change	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"yes_no_order","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	yes_no_order	value
 Feed Assessment		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"feed_assess_types","displayField":"value","valueField":"value"}	ehr_lookups	feed_assess_types	value
+General Behavior Observation	Behavior	{"xtype":"textfield"}
 General Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"general_obs","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	general_obs	value
 Genitourinary Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"genitourinary_obs","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	genitourinary_obs	value
 Hernia		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"hernia_types","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	hernia_types	value
 Hydration		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"hyd_score","displayField":"value","sortFields":"sort_order","valueField":"value"}	ehr_lookups	hyd_score	value
 Incision Status		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"incision_score","displayField":"value","sortFields":"sort_order","valueField":"value"}	ehr_lookups	incision_score	value
-Lameness/Disuse		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"lameness","displayField":"value","valueField":"value"}	ehr_lookups	lameness	value
+Lameness		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"lameness","displayField":"value","valueField":"value"}	ehr_lookups	lameness	value
 Mass		{"xtype":"textfield"}
 Menses		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"mens_score","displayField":"value","sortFields":"sort_order","valueField":"value"}	ehr_lookups	mens_score	value
-Mucous membranes		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"mucous_membranes","displayField":"value","sortFields":"sort_order","valueField":"value"}	ehr_lookups	mucous_membranes	value
+Mucous Membranes		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"mucous_membranes","displayField":"value","sortFields":"sort_order","valueField":"value"}	ehr_lookups	mucous_membranes	value
 Musculoskeletal Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"musculoskeletal_observations","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	musculoskeletal_types	value
-Neurologic Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"neurologic_observations","displayField":"value","valueField":"value"}	ehr_lookups	neurologic_observations	value
+Neurologic Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"neurologic_observations","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	neurologic_observations	value
 New Injury Observed	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"yes_no_order","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	yes_no_order	value
-Obstetric observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"obstetric_observations","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	obstetric_observations	value
-Ocular Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"ocular_observations","displayField":"value","valueField":"value"}	ehr_lookups	ocular_problem	value
+Obstetric Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"obstetric_observations","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	obstetric_observations	value
+Ocular Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"ocular_observations","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	ocular_problem	value
 Other Stereotopy	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"yes_no_order","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	yes_no_order	value
-Preferences	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"preferences","displayField":"value","valueField":"value"}	ehr_lookups	preferences	value
-Rectal prolapse		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"rectal_prolapse","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	rectal_prolapse	value
-Respiratory observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"respiratory_observations","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	respiratory_observations	value
-Respiratory rate		{"xtype":"textfield"}
+Preferences	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"preferences","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	preferences	value
+Rectal Prolapse		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"rectal_prolapse","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	rectal_prolapse	value
+Respiratory Observations		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"respiratory_observations","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	respiratory_observations	value
+Respiratory Rate		{"xtype":"textfield"}
 Self Biting Observed	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"yes_no_order","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	yes_no_order	value
-SIB Score	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"sib_score","forceSelection":true,"displayField":"value","valueField":"value"}	ehr_lookups	sib_score	value
+SIB Score	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"sib_score","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	sib_score	value
 Special Enrichment	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"yes_no_order","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	yes_no_order	value
 Stool		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"stool_types","displayField":"value","sortFields":"sort_order","valueField":"value"}	ehr_lookups	stool_types	value
-Temperament	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"temperament","displayField":"value","valueField":"value"}	ehr_lookups	temperament	value
-Vaginal/uterine prolapse		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"vaginal_uterine_prolapse","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	vaginal_uterine_prolapse	value
+Temperament	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"temperament","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	temperament	value
+Vaginal/Uterine Prolapse		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"vaginal_uterine_prolapse","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	vaginal_uterine_prolapse	value
 Verified Id?		{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"yes_no_order","forceSelection":true,"displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	yes_no_order	value
 Wound Severity	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"wound_severity","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	wound_severity	value
 Wound Status	Behavior	{"xtype":"ehr-simplecombo","schemaName":"ehr_lookups","queryName":"wound_status","displayField":"value","valueField":"value","sortFields":"sort_order"}	ehr_lookups	wound_status	value
\ No newline at end of file
diff --git a/nirc_ehr/resources/data/problem_list_subcategory.tsv b/nirc_ehr/resources/data/problem_list_subcategory.tsv
index 69bdab03..fae2d42c 100644
--- a/nirc_ehr/resources/data/problem_list_subcategory.tsv
+++ b/nirc_ehr/resources/data/problem_list_subcategory.tsv
@@ -17,8 +17,8 @@ Traumatic amputation(s)	Trauma
 SIB (self-injurious behavior)	Trauma
 Other trauma	Trauma
 Diarrhea	GI abnormality
-Undercondition	GI abnormality
-Dehydration	GI abnormality
+Undercondition	General abnormality
+Dehydration	General abnormality
 Bloody Stool	GI abnormality
 Anorexia	GI abnormality
 Rectal prolapse	GI abnormality
diff --git a/nirc_ehr/resources/scripts/nirc_triggers.js b/nirc_ehr/resources/scripts/nirc_triggers.js
index f57acaa9..bd1b726c 100644
--- a/nirc_ehr/resources/scripts/nirc_triggers.js
+++ b/nirc_ehr/resources/scripts/nirc_triggers.js
@@ -118,4 +118,10 @@ exports.init = function (EHR) {
             removeTimeFromDate: false
         });
     });
+
+    EHR.Server.TriggerManager.registerHandlerForQuery(EHR.Server.TriggerManager.Events.INIT, 'study', 'cases', function(event, helper) {
+        helper.setScriptOptions({
+            allowDatesInDistantPast: true
+        });
+    });
 }