Fix bug in matching of multi-keyword queries

Count the number of matched keywords, not the number
of matched _occurrences_ of keywords.