Service for default search works.
Fixed merge conflict and not using theme functions for nils yet.