fix question mark output from db
merge
fix