Sneha/D3 | #1121 | fixed toggling firstName and lastName using markup.