Fix issue with join extraction from S3ResourceQuery/Query combinations