add queries from bug470 to the bug473 case