refactoring: make enum fields final
Simplify pocket query selection process