reorganized scaffold for indicator value (added date)