add eager-check/ignore-empty option support