Fix content entry next/previous ordering issue