Fix format to match queryDSL