Including Query Sub-Components in the Analytical View