Further improve handling of checking for encrypted id