Improving Query mechanism
Adding download feature