Some changes on S3 Query