closes open-classifieds/open-eshop#366 and closes open-classifieds/openclassifieds2#1079