GR 42 - restrict fields

@twinge, please review
I'm sure you already had plans to add more tests, but we definitely want to test more variations (including relationships, etc)