Numeric/boolean selects

Change-Id: I25cfc2b92c0e96583afbb002d3d7c2b858de2c6a