Update v12

Moved ent check out of the select.