A.F....... [ZBXNEXT-2160] Changed param formatting in translation strings to "s" instead of "d" for integers
..F....... [ZBXNEXT-1036] code refactoring and minor fixes