Fixed dictionary filter validation
Finishing touches. Still missing big cli test