[distinct] added distinct, but block join has some issues, need to either (a) revert to non-block join or (b) fix