Bug: Adding charset for database issues