Shouldn't these match the incident query attributes? Or better yet, shouldn't these not be.. duplicated?