A......... [ZBXNEXT-282] minor code refactoring in web scenarios