Added try catch for exeption in Controller
Modified query for new data sources