43afb85056
* Improve consistency between MQL and builder queries * Review * Review and fix test
* Improve consistency between MQL and builder queries * Review * Review and fix test