Today
merge from researchtable_text_fix