Added error handling for unsuccessful performance queries
Updated TODOs