case update and enhancement

Signed-off-by: Yanbing Du <ydu@redhat.com>