Bug 925521 - Follow-up: context search changes. r=gps