fix subqueries. Step 2 : fix