refactor 7 case + Select.class