more robust destination lookup, code streamlining