Fix multiple copies of vars stored in local DB