Fix issue restoring categories. Also fix missed BwString on indexing