Updates to flex reports to better handle TriMet E&D report