Revert to including only allowed fields

This will make field: * faster and already scoped.