Update AWS CLI commands to use --query command

Use --query instead -cut in order to get appropriate volume IDs and snapshot IDs