Fix for SearchPanel field names