simplify book selectivity code
book and ECO mapping updates