Merge pull request #264 from daniellemayne/develop

avoid NPE on product filtering
folder support