[FIX] Actually replace spaces as well as other special characters