Fixed edits to work in list context