Fixes for r-click unflag