changed to use quote_plus