fix(expired) - check for old schema as well