mods to address issues #85 and #86 https://github.com/thehogfather/pvsio-web/issues/85 https://github.com/thehogfather/pvsio-web/issues/86