Categories are now correctly linked with contents.