Fix filter and data search