Improve control flow normal predicate
Fix probe paths order