[36] Fixed previous commit

* And also a couple of bugged queries :P