Allow filtering by struct values and int, int32, float32.

Change-Id: I098db80cae1de1101c0d1ad05f6af043d1d39f04