diff --git a/process.lua b/process.lua
index 9673d18..7a10260 100644
--- a/process.lua
+++ b/process.lua
@@ -145,7 +145,7 @@ function setZOrder(is_rail, ignore_bridge)
 	local layer = tonumber(Find("layer"))
 	local zOrder = 0
 	local Z_STEP = 14
-	if not ignore_bridges and toBridgeBool() then
+	if not ignore_bridge and toBridgeBool() then
 		zOrder = zOrder + Z_STEP
 	elseif toTunnelBool() then
 		zOrder = zOrder - Z_STEP
@@ -943,7 +943,7 @@ function process_pois(polygon)
 	local leisure = valueAcceptedOrNil(poi_leisure_values, Find("leisure"))
 	local emergency = valueAcceptedOrNil(poi_emergency_values, Find("emergency"))
 	local highway = valueAcceptedOrNil(poi_highway_values, Find("highway"))
-	local office = valueAcceptedOrNil(poi_highway_values, Find("office"))
+	local office = valueAcceptedOrNil(poi_office_values, Find("office"))
 	if amenity == nil and shop == nil and tourism == nil and historic == nil and leisure == nil and emergency == nil and highway == nil and office == nil then
 		return false
 	end