Refactor JOIN
Eliminate some useless code and properly reset isupport