remove quotes from names and add title to schema
fix bug in metrics