treimanntq

Reordered query for step 20400f

Reduces time for step 20400f by about 50%