Form question mapping behavior change?

I have some fairly complex forms using branching to guide my users from our entire product catalog down to specific products and packaging types. Each of these stages has a custom field to facilitate accurate reporting, and the form is built this way to ensure the user is only presented with narrowed-down options relevant to the particular product they’re referencing.

Previously, I was able to set single-select questions with only the relevant options for the specific branches and map them all to a single text custom field, which worked great for preventing false requests and helping to ensure those requests are pulled into the task consistently.

For example, Product A may come in a canister or a zipper pouch, while Product B is available in a bottle or a canister. The branch for Product A does not offer a bottle option, and the branch for Product B does not offer a zipper pouch option, but both questions map to the same text field for packaging type so that the task ultimately has this one piece of information in a reliable location and the user isn’t able to select a non-available packaging type or type in a variant on the standardized name, which would later interfere with searches or require manual adjustment.

Recently, when trying to add a new product category and associated products, I found the form builder no longer allows me to map a single-select question to a text field, so I am unable to provide narrowed lists of product names unless I create a dozen custom fields, one for each category, that are otherwise completely unnecessary.

Is there any possibility this might switch back to allowing the values from single select questions to map to a text field? If not, I need to rebuild the entire structure of our project and form, making them more complex on the back end in order to keep them user-friendly on the front end.