GUI-1210
fiddled with dst_key formulation to handle all cases