fix for ' and loading/error