grdshop: fixes from review