Refine condition activity and missing activity

Signed-off-by: Ajax Chai <ajaxchai@gmail.com>