Rename the query sample with a subquery in a SELECT
Refactor the sample listing