fixed survey metrics iter 3
Merge branch 'improve_metrics'
adding latest migration
Merge branch 'improve_metrics'