Change location join to outer and handle null groups