Merge pull request #1 from cmaumet/query_test

Suggestion of OPTIONAL items in clusters query
edited for optional attributes in peak query
edited for optional attributes in height/extent query
edited for optional attributes in height/extent query