--- a/servicealerts_api.php
+++ b/servicealerts_api.php
@@ -2,16 +2,16 @@
 include ('include/common.inc.php');
 
 if (basename(__FILE__) == "servicealerts_api.php") {
-	$return = getServiceAlerts($_REQUEST['filter_class'],$_REQUEST['filter_id']);
+	$return = getServiceAlertsAsJSON($_REQUEST['filter_class'],$_REQUEST['filter_id']);
 header('Content-Type: text/javascript; charset=utf8');
 // header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/');
 header('Access-Control-Max-Age: 3628800');
 header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
 if (isset($_GET['callback'])) {
-	$json = '(' . json_encode($return) . ');'; //must wrap in parens and end with semicolon
+	$json = '(' . $return . ');'; //must wrap in parens and end with semicolon
 	//print_r($_GET['callback'] . $json); //callback is prepended for json-p
 }
-else echo json_encode($return);
+else echo $return;
 }
             ?>