Fix checking type for expanding abbreviation. Also move types htmldjango/drupal into default settings.
Check bundled type at the first