I agree this could use a refactor, especially from the point of view of users who get presented with this CQL. It is in the backlog so we will get a chance to do it properly.