HTML-429 - Minor changes to let HTML Form Entry work better with new UI in the EMR module and Reference Application