Many changes to better handle categories in indexing