Fix quote interpol + no need to pass event [#230][#156]