add queries from bug472 to the bug473 case