#548 - Fix broken rule builder submissions