update rules engine to match forms