Fixed issue with filters behavior and between filter