blah
merge
fixed inconsistent patient filter