fix for single qoute + refactoring + comments
category selection for TEUDOT-SAL