Datastore fix to support has_variant_data in server