Item availability based on branch when building packages

Currently when building packages if you select that the package is only for a specific branch, the item drop downs still contain every price list item for every branch. The item names don't indicate what branch they are for either. You end up needing to change every item name in the price list to contain a branch identifier in order to build accurate packages, and then have to go change all the item names back to normal. This process must be completed any time a customer needs a new package or needs pricing updated. If you only have 2 branches it's not as time consuming, but if you have 5 branches all with different pricing, you end up with 1500 item names to change twice every time you update. This is a major time inefficiency. Please see screenshot attached.