[#52426069] Allign Options with Source and Destination