Cut extra query for measures #52