Fixed finding public queries