Fixed data collection to adapt to new website features.