closes #746; #653 - fix tariff evaluatoin for storage devices