changes for classifications editor and better search