Fixed: bugs when edited class
Feature: cet mask query