change for GCOD-306
change form label to match facet label
changes for GCOD-340
Merge pull request #37 from deniszgonjanin/master

fixes for outstanding issues