Fixed the rule engine trying to run all the rules regardless of the structure and fixed the form that broke because of the last fix