grails

I have modified the query to get results for the second part of the main OR, and I'm getting all the results, but not the ones that match isNull('data'), I'm not sure but this feels like a bug:

Version.withCriteria {
         or {
            isNull('data') &lt;&lt;&lt;&lt; match no data
            and {
               isNotNull('data')
               data {
                  versioning {
                     lt('validUntil', date_version_at_time)
                  }
               }
            }
         }
      }