Update FileSystem Autocompletion to use tags