Updated cloud code

Many queries have been improved
Merge branch 'refs/heads/arcayne-branch'