BI 4.1 - BICS Issue

There is an issue in converting a few UNV based WEBI reports (BW data source) from 3.1 to BICS based WEBI reports (BW data source) in 4.1. This is because of a limitation of BICS that it cannot handle the measure / detail objects in query filters.

Please can you advise on the possible workarounds to handle this limitation.