CARE #25: Further refinement of the query creation view