Fixed some poor handling of the specificity of the filter blocks. These still had the risk of interaction which was the original cause of #39.