Make core form work with directory again
Stop code from storing categories as sets