diff --git a/blocks/html/cemeteries/cemeteryInfo.inc b/blocks/html/cemeteries/cemeteryInfo.inc
index 64ec062..6af5a8b 100644
--- a/blocks/html/cemeteries/cemeteryInfo.inc
+++ b/blocks/html/cemeteries/cemeteryInfo.inc
@@ -18,7 +18,11 @@ if (userIsAllowed('Sections')) {
 $name = View::escape($this->cemetery->getName());
 echo "
 <h1>$name</h1>
-<h2>$addButton Sections</h2>
+<h2>$addButton Sections
+";
+	include APPLICATION_HOME.'/blocks/html/serviceButtons.inc';
+echo "
+</h2>
 <table>
 	<thead>
 		<tr><th></th>
diff --git a/blocks/html/cemeteries/cemeteryList.inc b/blocks/html/cemeteries/cemeteryList.inc
index c7c7200..513fa45 100644
--- a/blocks/html/cemeteries/cemeteryList.inc
+++ b/blocks/html/cemeteries/cemeteryList.inc
@@ -17,6 +17,7 @@
 			}
 		?>
 		Cemeteries
+		<?php include APPLICATION_HOME.'/blocks/html/serviceButtons.inc'; ?>
 	</h2>
 	<ul><?php
 			foreach ($this->cemeteryList as $cemetery) {
diff --git a/blocks/html/interments/intermentList.inc b/blocks/html/interments/intermentList.inc
index a6571d9..2cbe172 100644
--- a/blocks/html/interments/intermentList.inc
+++ b/blocks/html/interments/intermentList.inc
@@ -8,6 +8,7 @@
  */
 $previousSort = isset($_GET['sort']) ? $_GET['sort'] : 'deceasedDate';
 $url = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
+$url->purgeEmptyParameters();
 $return_url = $url->__toString();
 ?>
 <div class="interfaceBox">
@@ -24,6 +25,7 @@ $return_url = $url->__toString();
 			}
 		?>
 		Interments
+		<?php include APPLICATION_HOME.'/blocks/html/serviceButtons.inc'; ?>
 	</h2>
 	<table>
 		<thead>
diff --git a/blocks/html/serviceButtons.inc b/blocks/html/serviceButtons.inc
new file mode 100644
index 0000000..149d9d8
--- /dev/null
+++ b/blocks/html/serviceButtons.inc
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Renders buttons for each of the known output formats, pointing to the current URL
+ *
+ * @copyright 2010 City of Bloomington, Indiana
+ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+ * @author Cliff Ingham <inghamn@bloomington.in.gov>
+ */
+$serviceURL = new URL($_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI']);
+$serviceURL->purgeEmptyParameters();
+$serviceURL->format = 'xml';
+echo "
+<button type=\"button\" class=\"xml\" onclick=\"window.open('$serviceURL');\">
+	XML
+</button>
+";
+$serviceURL->format = 'json';
+echo "
+<button type=\"button\" class=\"json\" onclick=\"window.open('$serviceURL');\">
+	JSON
+</button>
+";
diff --git a/blocks/json/cemeteries/cemeteryList.inc b/blocks/json/cemeteries/cemeteryList.inc
new file mode 100644
index 0000000..16233f0
--- /dev/null
+++ b/blocks/json/cemeteries/cemeteryList.inc
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @copyright 2010 City of Bloomington, Indiana
+ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+ * @author Cliff Ingham <inghamn@bloomington.in.gov>
+ */
+$cemeteries = array();
+foreach ($this->cemeteryList as $cemetery) {
+	$name = addslashes($cemetery->getName());
+	$url = addslashes($cemetery->getURL());
+	$googleMapUrl = addslashes($cemetery->getGoogleMapURL());
+	$cemeteries[] = "
+	{	\"id\":\"{$cemetery->getId()}\",
+		\"name\":\"$name\",
+		\"url\":\"$url\",
+		\"googleMapUrl\":\"$googleMapUrl\"
+	}
+	";
+}
+$cemeteries = implode(',',$cemeteries);
+echo "[$cemeteries]";
diff --git a/blocks/xml/cemeteries/cemeteryList.inc b/blocks/xml/cemeteries/cemeteryList.inc
new file mode 100644
index 0000000..b5d02e5
--- /dev/null
+++ b/blocks/xml/cemeteries/cemeteryList.inc
@@ -0,0 +1,21 @@
+<cemeteries>
+<?php
+/**
+ * @copyright 2010 City of Bloomington, Indiana
+ * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
+ * @author Cliff Ingham <inghamn@bloomington.in.gov>
+ */
+foreach ($this->cemeteryList as $cemetery) {
+	$name = View::escape($cemetery->getName());
+	$url = View::escape($cemetery->getURL());
+	$googleMapUrl = View::escape($cemetery->getGoogleMapURL());
+	echo "
+	<cemetery id=\"{$cemetery->getId()}\">
+		<name>$name</name>
+		<url>$url</url>
+		<googleMapUrl>$googleMapUrl</googleMapUrl>
+	</cemetery>
+	";
+}
+?>
+</cemeteries>
\ No newline at end of file