analytics fix attribute list logic
Merge branch 'analytics'