Some bug fixes at empty text
Some bug fixes at empty text