fix matching of measurement rows and variable types

Reviewer: Tiffany Go

Issue: 8078