Ticket #1217: Adding missing stuff to flagging interaction