Added query checking, deleted verfied feature