Moved handling of directory search filters to its corresponding class. Fixes #18