Improve and fix protection label/block bug.