Issue 192 - Clean up from #153

--HG--
extra : rebase_source : c556d5872931c2db8c0d46c190442a4536acabfd
Issue 153 - FilterStorage.firstRun isn't being set

--HG--
extra : rebase_source : 15920029bfa4e3d15d262f1c7af869e585b22682