Some minor bugs on generate content functionality fixed