Use existing methods for search, and get authority from resources

Change-Id: Ia5546689a373680330357da4f59663b66413fcf9
3 files changed