Tweak Autocompletion because join is weird