CLSN-2045 code review till 25th nov - son
 get matrix list query not as expected