[FIX] decorator fixed + check in db + clean up