Try to make sure getSite returns a site object.
Moving search config values from O2-Framework.
Using git now.