Articles n+1 and little bugfix