Bug fix

Bug fix and add support to track GA submission