Split out search functions.
Add local-gatekeeper-p.