Fix add all selection criteria