DATAJPA-361 - Skip query.list if necessary