fix bugs when dealing with header properties and extra parameters