Better content item adding behavior, probably broke a lot of tests