added comment text property
optimizations to reduce queries issued