Filter by keyword fix