Moved filters to graphics
Added the path collection
Bug fix