Include template names into completions, adjust relevance