fixed tags on pages and fixed data format