Tool Improvements

Improved Filter Text and Grid Generator