         switch(query) {
         case let .Like(query_string):
             if let _ = query_string.rangeOfString("^\\p{Arabic}+$", options: .RegularExpressionSearch) {
-                f_articles = articles_table.filter(ar_inf_wo_vowels.like("%\(query_string.stripForbiddenCharacters())%")).order(nr)
+                let qs = query_string.stripForbiddenCharacters()
+                f_articles = articles_table.filter(ar_inf_wo_vowels.like("%\(qs)%") || ar123_wo_vowels_n_hamza.like("%\(qs)%")).order(nr)
                 queryRegex = makeRegexWithVowels(query_string.stripForbiddenCharacters())
             } else {
                 f_articles = articles_table.filter(translation.like("%\(query_string.stripForbiddenCharacters())%")).order(nr)

    let mn1 = Expression<String>("mn1")
    let mn2 = Expression<String>("mn2")
    let mn3 = Expression<String>("mn3")
    
    let updated_at = Expression<NSDate>("updated_at")
    let search_string = Expression<String>("search_string")

            }
        case let .Exact(query_string):
            if let _ = query_string.rangeOfString("^\\p{Arabic}+$", options: .RegularExpressionSearch) {
                let qs = query_string.stripForbiddenCharacters()
                f_articles = articles_table.filter(
                    qs == articles_table[ar_inf_wo_vowels] ||
                    qs == articles_table[ar123_wo_vowels_n_hamza] ||
                    ar123_wo_vowels_n_hamza.like("\(qs) %") ||
                    ar123_wo_vowels_n_hamza.like("% \(qs)") ||
                    ar123_wo_vowels_n_hamza.like("% \(qs) %")
                    ).order(nr)
                queryRegex = makeRegexWithVowels(query_string.stripForbiddenCharacters())
            } else {
                let qs = query_string.stripForbiddenCharacters()
