Fix issue #4 and #7

Fix parameter and header name display issues