Query solution is great but improve time reducti...

Query solution is great but improve time reduction for query