Limit the scope of the type constrain hack
Make sure the site can still be deleted