........S. [ZBXNEXT-1782] small code improvements