[FEATURE] Fixed speaker and category based selects and removed unneeded templates for now