Change sample buckets queries so they don't have hardcoded bucket names

When a sample bucket is restored but the target bucket does not ahve the correct sample bucket name the queries fail to execute. They have to be re-written so that they can be pused into the query endpoint and work regardless of the bucket name.