content fixes and some bug fix for name dup