Improved: Replace all delegator findByAnd and findOne method calling by EntityQuery methods (OFBIZ-10029) Applied slightly modified patch, rearrange import properly, Thanks Suraj Khurana for your contribution