fixes to accomidate no data for pages correctly