TO REBASE. [Smidsy] extract header_extras
Minor Refactor select report.js, fixing error