Fixed log macro use
Fixed tokenization of properties for tracking in command line parameter