Query Strings causing 404 errors

I have picked up a site that is redirecting links from a Zencart website to the new urls on a WooCommerce site. Because of the way the redirects were entered by the original developer adding the query strings from the “Redirect From” URL is causing the redirects to 404.

This example results in a 404 error.
From: https://www.modarmory.com/index.php?main_page=product_info&cPath=106&products_id=1078
To: https://www.modarmory.com/?product=z-bolt-green-laser-system-btmk-2s
Redirect to: https://www.modarmory.com/?product=z-bolt-green-laser-system-btmk-2s?main_page=product_info&cpath=106&products_id=1078

I know we can go back and change the several hundred redirects to remove the query string structure in the “Redirect To” field but it is going to take a lot of time and ultimately we don’t need the query strings for any of the redirects that have been setup.

Another example is
From: https://www.modarmory.com/index.php?main_page=contact_us
To: https://modarmory.com/contact-us/
Redirect to: https://www.modarmory.com/contact-us/?main_page=contact_us

Is there a solution for this? Would it be possible to add a checkbox option on the redirects to include the query strings. It could default to on so it would be backward compatible but we could turn it off where it isn’t needed.

Thanks

The page I need help with: [log in to see the link]