Fix for params with apostrophes