Fixed issue with filters behavior and between filter
Fixed a syntax error
Merge pull request #266 from Skullbock/development

Fixed issue with filters behavior and between filter