Refine the "force" hack to ensure that the search criteria are really empty.  We were breaking results paging.

Change-Id: Ib49fe9d3726af0b5491b7ee98b19b8aef392acbd