added conditions on several solver rules