Fix double encoding issue in remove buttons