LPS-34286 Fix for two out of three issues.

Can you check the logic in this? It works fine and it's hitting the code in the way that I expect it to.
Last issue to be resolved: Distribution Scope Drop-down menu; separate issue under same ticket.