Refactored code to consider classification when searching, filtering, selecting.