filter workaround for demo added