Ugly patch to fix broken service keys lookups from data, when checking is there need to update