Fix double encoding issue in add buttons