Added support of attributesToSnippet & queryType