Fixed behaviour while choosing metrics with commas in the middle of it's name