Inventory stock report requires modification

Dear Experts,

I am having this query which provides me a list of items in stock with particular warehouse and item group

Select Distinct T2.ItmsGrpNam,  T0.ItemCode, T0.ItemName, T0.FrgnName as 'Part No', T1.WhsCode, T1.OnHand, T0.LastPurPrc, (T1.OnHand * T0.LastPurPrc) as 'Total' from OITM T0 left outer join OITW T1 on T0.ItemCode = T1.ItemCode  left outer join OITB T2 on

T0. ItmsGrpCod = T2.ItmsGrpCod

where ( T2.ItmsGrpNam = '[%0]' or '[%0]'='') and (T1.WhsCode = '[%1]' or '[%1]'='') and (T1.OnHand >0 or T1.OnHand <0)

UNION ALL

select Null,NULL, NULL, NULL,'Total', SUM(T1.OnHand), SUM( T0.LastPurPrc),Sum( (T1.OnHand * T0.LastPurPrc)) from OITM T0 left outer join OITW T1 on T0.ItemCode = T1.ItemCode left outer join OITB T2 on T0. ItmsGrpCod = T2.ItmsGrpCod

where (T2.ItmsGrpNam = '[%0]' or '[%0]'='') and( T1.WhsCode = '[%1]' or '[%1]'='' ) and (T1.OnHand >0 or T1.OnHand <0)

When I execute the item group and warehouse comes as shown below

However I require another option to be added   Properties (present in the item master data) also to appear , where in the user can select any particular warehouse and any one of the property which is ticked.

I tried using OITG table separately, but it doesn't show the actual stock

Kindly help me in this query to resolve the issue

Thanks&Regards

Darshan Desai