Split teacup rides from Cyber World Puzzles?

There was a discussion on this a while back whether to split by location or by puzzle type, and splitting by location won. Splitting by puzzle type now would only make it inconsistent.