Normalize prev/next data-type as arrays, updated some next links