Boolean/numeric lookups

Change-Id: I23ce6521c2c1e286605acb800d9a8d31fe2d0eb0