Improve rendering type switching