[#97] Simplify query

* No need to JOIN. I have no idea why it that way...