fix concurrency issue with the map; introduce new exception; add incomplete retry query runner test
fix header so it passes the entire context