Adding some comments
Adding button to query DS