Fixes bug with service requests with service extra fields not rendering
Merge branch 'develop'