fix: use omit when checking ideal tree engine, centralize shouldOmit logic

fix: use omit when checking ideal tree engine, centralize shouldOmit logic #3997