fix issue with level / measure order
attempt to fix spark issue on multiple queries