Fixes #3 filter / search problems