Merge "Fix model type searching"