Update to finder Query
2.5.x fix for form