Integrated aman's stuff
Added query Controller.js