update some handling in choose_content_model - should be backwards-compatible