Added missing typeahead and fixed ModCP reports