added more checks, some workaround on system subscription to skip blocker bugs