Set OPTIONAL items in cluster query
Merge pull request #1 from cmaumet/query_test

Suggestion of OPTIONAL items in clusters query