Fixing a bug where local vs. cloud data preference wasn't functioning properly