- Added filtering (only by name and contents)