correct default port number
Merge remote branch 'origin/35061477-user-defined-fields' into 35061477-user-defined-fields
now showing data in collapsed view - just picks the first three fields with value