LPS-40695 We don't need left join in count
LPS-40695 Revert changes LPS-33388, because are causing this regresion bug LPS-40695