The type-safety of the DSL needs to be improved in order to make it harder (and preferably impossible) to construct invalid queries using it. Improving the typing of the DSL will also improve hints provided by IDE's.