move autojoin into core because wtf