Database: rewritten joins parser (BC break!)
typo: reordered methods