Wrong Order By clause when ad hoc query done on multi-block forms

We were running 11g forms against multiple 10g database for months with no problems.  We recently upgraded the databases to 11g.  Now the forms with multiple data blocks will not work if the user does an ad hoc query on the non-top data block.  When the forms open and an automatic execute-query is done they query correctly.  But if the user tries an ad hoc query on any block other than the top most block, the order by clause for the top block is put with the query for the second block.  These happen when the order by clause is