Done with filtering storage. Issue #5.