Invasive change in iview_queries.pl