Fixing network navigation question mark bug
PredicateAnnotator further preparations