Fixed problem with edit on requests optimization