Minor Modifications

Working towards removing all the queries - At this stage, they cannot
be simply removed.