This is intended to fix #215. - Use named captures to make the matching more clear and resilient. - Add a test for the specific query from issue #215to demonstrate the fix.