Expand id fixer to cover more symbols