closes https://github.com/open-classifieds/open-eshop/issues/364 closes https://github.com/open-classifieds/openclassifieds2/issues/1076