Fix bad escaping in select replacement.
Fix conflict of pull-req