fix bug in schema/builder: schema should filter for null values, not builder