CLSN-2085 code review till 3rd dec ---sonu

matrix query - still wrong (corrected now)