Dc/Melanie | #3747 | Fixing returning field name for field-list instead of random string