add new logic to validate filters (still there are some erros...)