If anyone is interested in seeing/testing the new "Add Filter" dialog, I've just committed it to my dev branch (cn187_devel).
It's a bit busy, 'cause there are a lot of fields. But I tried to make it as user-friendly/intuitive as I could, given the complexity.
Bug reports and/or usability feedback/suggestions appreciated.