Add fields to resources view
Merge branch '433' into develop