Missing checks on extrafields

These commit waiting to be tested before turning on other objects