Avoid flush by category selector
Merge pull request #3 from Guite/master

Avoid flush by category selector