closed araqne/logpresso.com#257. added left join
fixed merge conflict