Added query type names on references