MBS-6330, temporary workaround for countries not showing up on indexed search.
MBS-6330, use type_to_model + stylistic fix requested by ocharles.
Merge branch 'mbs-6330' into beta

* mbs-6330:
  MBS-6330, use type_to_model + stylistic fix requested by ocharles.
  MBS-6330, temporary workaround for countries not showing up on indexed search.