HCSVLAB-362: Fixed bugs reported by QA (discarded tailing spaces, special chars, etc.)