fixed DB modification issues