Searching specific location in Advanced Search not limiting correctly in 3.0

Eg 3.0
OSRF 3.0
Pg 9.4
Ubuntu 14.04

When logged in as a staff member on either the web or staff clients searching at a specific location limits results inconsistently. It's not limited only to the selected location but it is significantly fewer items than searching everywhere. For instance, searching evergreen.lib.in.us/eg/opac for the title Bag of Bones at the location Indiana State Library - Indianpolis the search returns 4 results: 1 large print book and 3 Overdrive records. When staff perform the same search in any client, 11 results are returned: the same 4 as the public search plus 2 totally unrelated print books, a cd and 3 e-music records, none of which have ever had holdings at this location.

Pulling the database query out for the same search logged in and not, there are 2 primary differences:

The staff search includes these 2 column definitions:
,c_attr AS (SELECT (ARRAY_TO_STRING(ARRAY[search.calculate_visibility_attribute_test('circ_lib','{73}',FALSE)],'&'))::query_int AS vis_test FROM asset.patron_default_visibility_mask() x)
,b_attr AS (SELECT (ARRAY_TO_STRING(ARRAY[search.calculate_visibility_attribute_test('luri_org','{1,72,73}',FALSE)],'&'))::query_int AS vis_test FROM asset.patron_default_visibility_mask() x)

where the public search defines them like so:
,c_attr AS (SELECT (ARRAY_TO_STRING(ARRAY[c_attrs,search.calculate_visibility_attribute_test('circ_lib','{73}',FALSE)],'&'))::query_int AS vis_test FROM asset.patron_default_visibility_mask() x)
,b_attr AS (SELECT (ARRAY_TO_STRING(ARRAY[b_attrs,search.calculate_visibility_attribute_test('luri_org','{1,72,73}',FALSE)],'&'))::query_int AS vis_test FROM asset.patron_default_visibility_mask() x)

(Note the 'c_attrs,' and 'b_attrs,' segments in the inner ARRAY, they're fields being pulled from the results of asset.patron_default_visibility_mask().)

Further down, in the WHERE clause is this difference:

staff search:
((EXISTS (SELECT 1 FROM asset.copy_vis_attr_cache WHERE record = m.source AND vis_attr_vector @@ c_attr.vis_test) OR NOT EXISTS (SELECT 1 FROM asset.copy_vis_attr_cache WHERE record = m.source))) OR ((b_attr.vis_test IS NULL OR bre.vis_attr_vector @@ b_attr.vis_test) OR NOT ( int4range(0,268435455,'[]') @> ANY(bre.vis_attr_vector) ))

and public search:

(EXISTS (SELECT 1 FROM asset.copy_vis_attr_cache WHERE record = m.source AND vis_attr_vector @@ c_attr.vis_test)) OR ((b_attr.vis_test IS NULL OR bre.vis_attr_vector @@ b_attr.vis_test))

The first difference strikes me as the potential issue. The patron version selects the *_attrs column of the results from asset.patron_default_visibility_mask() and groups that with the output of the appropriate call to search.calculate_visibility_attribute_test(), where the staff version ignores these *_attrs columns entirely and using only the output of search.calculate_visibility_mask().

Those are my *assumptions*, so I wanted to post this for possible discussion.