Add crude support for containment lookup, breaks key querying