Adding full query and select query
Merge pull request #8528 from techhat/cloudapi

Adding full query and select query