GR 42 - restrict fields

@twinge, please review
I thought we said we were going to always include parent_id?