     }
     
     public func wmf_currentSearchLanguageDomain() -> NSURL? {
-        return self.URLForKey(WMFSearchLanguageKey)
+        if let url = self.URLForKey(WMFSearchURLKey) {
+            return url
+        }else if let language = self.objectForKey(WMFSearchLanguageKey) as? String {
+            let url = NSURL.wmf_URLWithLanguage(language)
+            self.wmf_setCurrentSearchLanguageDomain(url)
+            return url
+        }else{
+            return nil
+        }
     }
     
     public func wmf_setCurrentSearchLanguageDomain(url: NSURL?) {

        self.synchronize()
    }

    
    
    public func wmf_setReadingFontSize(fontSize: NSNumber) {
        self.setObject(fontSize, forKey: "ReadingFontSize")
        self.synchronize()

    }
    
    public func wmf_openArticleURL() -> NSURL? {
        if let url = self.URLForKey(WMFOpenArticleURLKey) {
            return url
        }else if let data = self.dataForKey(WMFOpenArticleTitleKey){
            if let title = NSKeyedUnarchiver.unarchiveObjectWithData(data) as? MWKTitle {
                self.wmf_setOpenArticleURL(title.mobileURL)
                return title.mobileURL
            }else{
                return nil
            }
        }else{
            return nil
        }
    }
    
    public func wmf_setOpenArticleURL(url: NSURL?) {
