SELECT DSL reworked