Fix remove quotes when attributes contains whitespaces and package keywords typo