                             sa.ar_inf.addAttributes(matchAttr, range: match.range)
                             current_article_match_score += Int(Float(match.range.length) / Float(sa.ar_inf.string.length) * 100)
                         }
+                        for match in qRegex.matchesInString(sa.opts.string, options: [], range: NSMakeRange(0, sa.opts.length)) {
+                            sa.opts.addAttributes(matchAttr, range: match.range)
+                            current_article_match_score += Int(Float(match.range.length) / Float(sa.opts.string.length) * 100)
+                        }
                     } else {
                         for match in qRegex.matchesInString(sa.translation.string, options: [], range: NSMakeRange(0, sa.translation.length)) {
                             sa.translation.addAttributes(matchAttr, range: match.range)

        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)
                queryRegex = makeRegexWithVowels(query_string.stripForbiddenCharacters())
            } else {
                f_articles = articles_table.filter(translation.like("%\(query_string.stripForbiddenCharacters())%")).order(nr)

            }
        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()
