ensure any previous scopes are included in the query

hehe missed that
fix spec expectations

where is called on scoped not User now, so adapt to fix