The upstream commit should fix the issue. I would have liked to see some common logic between the different commands instead of coding this complex query again. It's very hard to read...