GR 42 - restrict fields

@twinge, please review
Nor above in skip_entity?(name) - OK