diff --git a/source/net/filebot/ui/analyze/AttributeTool.java b/source/net/filebot/ui/analyze/AttributeTool.java
index 29fded54..ae029145 100644
--- a/source/net/filebot/ui/analyze/AttributeTool.java
+++ b/source/net/filebot/ui/analyze/AttributeTool.java
@@ -2,6 +2,7 @@ package net.filebot.ui.analyze;
 
 import static net.filebot.Logging.*;
 import static net.filebot.MediaTypes.*;
+import static net.filebot.util.FileUtilities.*;
 
 import java.awt.Color;
 import java.io.File;
@@ -43,42 +44,43 @@ class AttributeTool extends Tool<TableModel> {
 
 	@Override
 	protected TableModel createModelInBackground(File root) throws InterruptedException {
-		List<File> files = (root != null) ? FileUtilities.listFiles(root) : new ArrayList<File>();
-
 		FileAttributesTableModel model = new FileAttributesTableModel();
-		for (File file : files) {
-			if (VIDEO_FILES.accept(file)) {
+
+		if (root == null) {
+			return model;
+		}
+
+		for (File file : filter(FileUtilities.listFiles(root), VIDEO_FILES, SUBTITLE_FILES)) {
+			try {
+				MetaAttributes attributes = new MetaAttributes(file);
+				String metaId = null;
+				Object metaObject = null;
+				String originalName = null;
+
 				try {
-					MetaAttributes attributes = new MetaAttributes(file);
-					String metaId = null;
-					Object metaObject = null;
-					String originalName = null;
+					originalName = attributes.getOriginalName();
+					metaObject = attributes.getObject();
 
-					try {
-						originalName = attributes.getOriginalName();
-						metaObject = attributes.getObject();
-
-						if (metaObject instanceof Episode) {
-							SeriesInfo seriesInfo = ((Episode) metaObject).getSeriesInfo();
-							if (seriesInfo != null) {
-								metaId = String.format("%s::%d", seriesInfo.getDatabase(), seriesInfo.getId());
-							}
-						} else if (metaObject instanceof Movie) {
-							Movie movie = (Movie) metaObject;
-							if (movie.getTmdbId() > 0) {
-								metaId = String.format("%s::%d", "TheMovieDB", movie.getTmdbId());
-							} else if (movie.getImdbId() > 0) {
-								metaId = String.format("%s::%d", "OMDb", movie.getImdbId());
-							}
+					if (metaObject instanceof Episode) {
+						SeriesInfo seriesInfo = ((Episode) metaObject).getSeriesInfo();
+						if (seriesInfo != null) {
+							metaId = String.format("%s::%d", seriesInfo.getDatabase(), seriesInfo.getId());
+						}
+					} else if (metaObject instanceof Movie) {
+						Movie movie = (Movie) metaObject;
+						if (movie.getTmdbId() > 0) {
+							metaId = String.format("%s::%d", "TheMovieDB", movie.getTmdbId());
+						} else if (movie.getImdbId() > 0) {
+							metaId = String.format("%s::%d", "OMDb", movie.getImdbId());
 						}
-					} catch (Exception e) {
-						// ignore
 					}
-
-					model.addRow(metaId, metaObject, originalName, file);
 				} catch (Exception e) {
-					debug.warning("Failed to read xattr: " + e);
+					// ignore
 				}
+
+				model.addRow(metaId, metaObject, originalName, file);
+			} catch (Exception e) {
+				debug.warning("Failed to read xattr: " + e);
 			}
 		}
 
diff --git a/source/net/filebot/ui/analyze/MediaInfoTool.java b/source/net/filebot/ui/analyze/MediaInfoTool.java
index 2e4d2ff3..a59cc9d6 100644
--- a/source/net/filebot/ui/analyze/MediaInfoTool.java
+++ b/source/net/filebot/ui/analyze/MediaInfoTool.java
@@ -1,24 +1,173 @@
 package net.filebot.ui.analyze;
 
-import java.io.File;
+import static net.filebot.Logging.*;
+import static net.filebot.MediaTypes.*;
+import static net.filebot.util.FileUtilities.*;
 
+import java.awt.Color;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.stream.IntStream;
+
+import javax.swing.BorderFactory;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableModel;
 
+import net.filebot.mediainfo.MediaInfo;
+import net.filebot.mediainfo.MediaInfo.StreamKind;
+import net.filebot.util.FileUtilities;
+import net.filebot.util.ui.LoadingOverlayPane;
+import net.miginfocom.swing.MigLayout;
+
 class MediaInfoTool extends Tool<TableModel> {
 
+	private JTable table = new JTable(new MediaInfoTableModel());
+
 	public MediaInfoTool() {
 		super("MediaInfo");
+
+		table.setAutoCreateRowSorter(true);
+		table.setFillsViewportHeight(true);
+		table.setBackground(Color.white);
+		table.setRowHeight(20);
+
+		JScrollPane scrollPane = new JScrollPane(table);
+		scrollPane.setBorder(BorderFactory.createEmptyBorder());
+
+		setLayout(new MigLayout("insets 0, fill"));
+		add(new LoadingOverlayPane(scrollPane, this), "grow");
 	}
 
 	@Override
 	protected TableModel createModelInBackground(File root) throws InterruptedException {
-		// TODO Auto-generated method stub
-		return null;
+		if (root == null) {
+			return new MediaInfoTableModel();
+		}
+
+		List<File> files = filter(FileUtilities.listFiles(root), VIDEO_FILES, AUDIO_FILES);
+		Map<MediaInfoKey, String[]> data = new TreeMap<>();
+
+		try (MediaInfo mi = new MediaInfo()) {
+			IntStream.range(0, files.size()).forEach(f -> {
+				try {
+					mi.open(files.get(f));
+					mi.snapshot().forEach((kind, streams) -> {
+						IntStream.range(0, streams.size()).forEach(i -> {
+							streams.get(i).forEach((name, value) -> {
+								String[] values = data.computeIfAbsent(new MediaInfoKey(kind, i, name), k -> new String[files.size()]);
+								values[f] = value;
+							});
+						});
+					});
+				} catch (Exception e) {
+					debug.warning(e.getMessage());
+				}
+			});
+		}
+
+		return new MediaInfoTableModel(files.toArray(new File[0]), data.keySet().toArray(new MediaInfoKey[0]), data.values().toArray(new String[0][]));
 	}
 
 	@Override
 	protected void setModel(TableModel model) {
-		// TODO Auto-generated method stub
+		table.setModel(model);
+	}
+
+	private static class MediaInfoKey implements Comparable<MediaInfoKey> {
+
+		public final StreamKind kind;
+		public final int stream;
+		public final String name;
+
+		public MediaInfoKey(StreamKind kind, int stream, String name) {
+			this.kind = kind;
+			this.stream = stream;
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj instanceof MediaInfoKey) {
+				MediaInfoKey other = (MediaInfoKey) obj;
+				return kind == other.kind && stream == other.stream && name.equals(other.name);
+			}
+			return false;
+		}
+
+		@Override
+		public int hashCode() {
+			return kind.ordinal() + (stream << 8) + name.hashCode();
+		}
+
+		@Override
+		public int compareTo(MediaInfoKey other) {
+			if (kind != other.kind)
+				return kind.compareTo(other.kind);
+			if (stream != other.stream)
+				return Integer.compare(stream, other.stream);
+			else
+				return name.compareTo(other.name);
+		}
+
+	}
+
+	private static class MediaInfoTableModel extends AbstractTableModel {
+
+		private final File[] files;
+		private final MediaInfoKey[] keys;
+		private final String[][] rows;
+
+		public MediaInfoTableModel() {
+			this(new File[0], new MediaInfoKey[0], new String[0][]);
+		}
+
+		public MediaInfoTableModel(File[] files, MediaInfoKey[] keys, String[][] rows) {
+			this.files = files;
+			this.keys = keys;
+			this.rows = rows;
+		}
+
+		@Override
+		public int getColumnCount() {
+			return files.length + 3;
+		}
+
+		@Override
+		public String getColumnName(int column) {
+			switch (column) {
+			case 0:
+				return "Stream";
+			case 1:
+				return "#";
+			case 2:
+				return "Property";
+			default:
+				return files[column - 3].getName();
+			}
+		}
+
+		@Override
+		public int getRowCount() {
+			return keys.length;
+		}
+
+		@Override
+		public Object getValueAt(int row, int column) {
+			switch (column) {
+			case 0:
+				return keys[row].kind;
+			case 1:
+				return keys[row].stream;
+			case 2:
+				return keys[row].name;
+			default:
+				return rows[row][column - 3];
+			}
+		}
 
 	}
 
diff --git a/source/net/filebot/ui/analyze/Tool.java b/source/net/filebot/ui/analyze/Tool.java
index 4f83653f..ca3be071 100644
--- a/source/net/filebot/ui/analyze/Tool.java
+++ b/source/net/filebot/ui/analyze/Tool.java
@@ -78,6 +78,7 @@ abstract class Tool<M> extends JComponent {
 
 					if (cause instanceof ConcurrentModificationException || cause instanceof InterruptedException) {
 						// if it happens, it is supposed to
+						debug.log(Level.FINEST, e.getMessage(), e);
 					} else {
 						// should not happen
 						debug.log(Level.WARNING, e.getMessage(), e);