Fixed remove quote feature