Fixed Event Listener Order and Fixed Revision Entity for Save