Control geometry type on categories
Get rid of 2154 in migrations