More changes on S3 Query & S5 Transform, as well as related code