Import shipment/Export shipment linked deliveries should be possible to find using initial document

Currently if FWO/FRO created not using initial booking/BL SAP TM not returns anything while performing search by BOL Number if orginal document No. used, in order to find FWO/FRO import shipment no. should be inputted. This is not convenient and requires additional steps to be taken by either CX team (providing IS no to dispatch) or dispatch (cheking IS in GCSS), so if it possible SAP TM should return FWO/FRO created from deriving document even if search is done by parent document no. this would save time and effort. It seems it was available for FRO screen for some time but not for FWO, also for import shipment please make possibility to search by inputting container no. as well