Fixes for new models and experimental tooltip