Fixing the type signature for all query entry points.