Make filtering find non-expanded examples in the demo

Change-Id: Idde2553c06366fbc39124fff65dd3674f5224791