fix only injecting when not present
add analytics