add Multiple Field Limit integration, refactoring