Refactor search layer and Announce controller.
Repeatable announce provider
Merge pull request #53 from b17/extended_search_layer

Refactor search layer and Announce controller.