NCBO-466 use * for count and count mapping and not term
NCBO-466 test corrections for counting mapping and not terms
test change in aero headers
lock update