Custom dimension and custom metrics fixed