[LAST COMMIT BEFORE REFACTORING LEFT JOINS]
Fixed left joins again