Better handling of CMS/HTMLField toolbar selection