Make next/last more explicit
Fix parser for empty items (merge commit)