Added marketplace pagination, fixes #200