**Description:** Fix instances of $Fetch and SQL queries in the code as well as API calls
Description:
Fix instances of $Fetch and SQL queries in the code as well as API calls