diff --git a/lib/Query.php b/lib/Query.php
index a6941e5..62a3d2b 100644
--- a/lib/Query.php
+++ b/lib/Query.php
@@ -247,8 +247,8 @@ class Query extends xmlTemplate {
 		# If our display order is empty, then dynamically build it
 		if (! count($result)) {
 			foreach ($this->results as $details)
-					foreach ($details as $attrs)
-						$result = array_merge($result,array_keys(array_change_key_case($attrs)));
+				foreach ($details as $attrs)
+					$result = array_merge($result,array_keys(array_change_key_case($attrs)));
 
 			$result = array_unique($result);
 			sort($result);
diff --git a/lib/QueryRender.php b/lib/QueryRender.php
index 66db61f..add4832 100644
--- a/lib/QueryRender.php
+++ b/lib/QueryRender.php
@@ -280,6 +280,8 @@ class QueryRender extends PageRender {
 
 						# Iterate over each attribute for this entry
 						foreach (explode(',',$ado) as $attr) {
+							$attr = strtolower($attr);
+
 							# Ignore DN, we've already displayed it.
 							if ($attr == 'dn')
 								continue;
@@ -459,7 +461,7 @@ class QueryRender extends PageRender {
 		$results = array();
 
 		foreach (explode(',',$this->template->getAttrDisplayOrder()) as $attr)
-			$results[$attr] = $attribute_factory->newAttribute($attr,array('values'=>array()),$this->getServerID());
+			$results[strtolower($attr)] = $attribute_factory->newAttribute($attr,array('values'=>array()),$this->getServerID());
 
 		return $results;
 	}