Fix categories with spaces as the context[@category] also needs converting