Add $atlasfeatureid and $atlasgeometry