improved work with DB
improved work with DB, fix