Fix liquid lookup in general