return types of cell query and header query changed to avoid typesystem bugs