Add the Auto-Join and fix the Tabulation crash.