I'm sure there may be rules that would suggest Shels' name should just replace Sheriff's in the draw and that means Shelbourne play in Tolka. But I don't think a team that won their place in the draw on the field should have to play away to a team that is still in the competition by default, just because the non-league side that beat them came out of the hat first. The preference should be to reward the team that wins on the field.