[1492] RG-Automatic assist refactoring to combine criteria