Try to fix filter for data selection