Fix typeahead find for basic keys
Fix missing row measurements for VABuilder