fix tagging bug, new issue with completion