Store seperately last boost time for heating and water and use it in next boost to minimise user actions. Also added new db fields.