Fix wrong parsing for subqueries ; represent subqueries graphically