[#883488] Review fixes and google analytics