Fix handling of empty page within DataSource