Additional spec fix related to sorting updates by file name
Use inner join when fetching measures

This is considerably faster and we still group by lots of measure
attributes so we shouldn't fetch duplicates