Fixes for Issue #18, Analytics new fields