Fixed nasty ISSUE with PREV/NEXT