EE-44 #resolve Save the where clause when passed into service
Merge branch '61320210-search-impl'