Enhance parseTarget euristic