Fix searching custom fields