Fix node bug

Thomas Nitscherequested to merge
fix_node_export_bug into dev

Fix layout.server bug

Merge request reports