diff --git a/server/wfnews-api/wfnews-persistence/src/main/resources/ca/bc/gov/nrs/wfnews/persistence/v1/dao/mybatis/mapper/PublishedIncidentMapper.xml b/server/wfnews-api/wfnews-persistence/src/main/resources/ca/bc/gov/nrs/wfnews/persistence/v1/dao/mybatis/mapper/PublishedIncidentMapper.xml
index 852b6e640..4de2dbfd0 100644
--- a/server/wfnews-api/wfnews-persistence/src/main/resources/ca/bc/gov/nrs/wfnews/persistence/v1/dao/mybatis/mapper/PublishedIncidentMapper.xml
+++ b/server/wfnews-api/wfnews-persistence/src/main/resources/ca/bc/gov/nrs/wfnews/persistence/v1/dao/mybatis/mapper/PublishedIncidentMapper.xml
@@ -327,22 +327,28 @@
 			RESPONSE_TYPE_DETAIL
 		FROM WFNEWS.PUBLISHED_INCIDENT_DETAIL
 		WHERE stage_of_control_code IS NOT NULL
-		  <if test="stageOfControlList != null &amp;&amp; !stageOfControlList.isEmpty() &amp;&amp; stageOfControlList.contains('OUT')">
-		      AND (stage_of_control_code = 'OUT' AND fire_year = #{currentFireYear, javaType=java.lang.Integer, jdbcType=NUMERIC, mode=IN})
-					<if test="stageOfControlList != null &amp;&amp; !stageOfControlList.isEmpty() &amp;&amp; stageOfControlList.size() &gt; 1">
-						OR stage_of_control_code IN
-					<foreach item="soc" collection="stageOfControlList" separator="," open="(" close=")">
-						<if test="soc != 'OUT'">
+			<if test="stageOfControlList != null &amp;&amp; !stageOfControlList.isEmpty()">
+				<choose>
+					<when test="stageOfControlList.contains('OUT')">
+						AND (
+							(stage_of_control_code = 'OUT' AND fire_year = #{currentFireYear})
+							<if test="stageOfControlList.size() > 1">
+								OR stage_of_control_code IN
+								<foreach item="soc" collection="stageOfControlList" separator="," open="(" close=")">
+									<if test="soc != 'OUT'">
+										#{soc}
+									</if>
+								</foreach>
+							</if>
+						)
+					</when>
+					<otherwise>
+						AND stage_of_control_code IN
+						<foreach item="soc" collection="stageOfControlList" separator="," open="(" close=")">
 							#{soc}
-						</if>
-					</foreach>
-				</if>
-		  </if>
-			<if test="stageOfControlList != null &amp;&amp; !stageOfControlList.isEmpty() &amp;&amp; !stageOfControlList.contains('OUT')">
-					AND stage_of_control_code IN
-				<foreach item="soc" collection="stageOfControlList" separator="," open="(" close=")">
-					#{soc}
-				</foreach>
+						</foreach>
+					</otherwise>
+				</choose>
 			</if>
 			<if test="xmin != null &amp;&amp; ymin != null &amp;&amp; xmax != null &amp;&amp; ymax != null">
 				AND geometry &amp;&amp; ST_MakeEnvelope (#{xmin, javaType=java.lang.Double, jdbcType=DOUBLE, mode=IN}, #{ymin, javaType=java.lang.Double, jdbcType=DOUBLE, mode=IN}, #{xmax, javaType=java.lang.Double, jdbcType=DOUBLE, mode=IN}, #{ymax, javaType=java.lang.Double, jdbcType=DOUBLE, mode=IN}, <include refid="latLonSrid"/>)