Fixed archives list, still need some rework