Fixed both pages database