EHP7 release 604? Release 604 corresponds to EHP4 as far as I know.
Anyway, the reason I asked, is because we recently upgraded to EHP4 SP level 85 and faced a similar issue. In our case, the selection screen had also changed & TAN based reporting became mandatory although we required company code wise reporting.
Had raised it to SAP & they released a pilot note for our benefit. Suggest you also raise it to SAP.