Quick Query - Drill Down Parameters with Spaces

Using SL 2018, CU1.

When creating a custom quick query, I have linked two drill down screens.

First is Work Order Entry, using the WONbr field from the QQ. This works correctly.

Second is Inventory Status Inquiry screen, this works for most of my inventory item IDs, (example: item 'ABC-123' works fine) 

The trouble is if I try to drill into a row when the  InvtID has a blank space in it, such as 'BIG WIDGET', the screen throws an 'Item Not found' error.

Is there a way to correctly pass the invtid parameter to the screen when there are blanks in the ID field?