Remove field type restriction, sort logic for is_hidden