Deal with non-str values that need to be replaced

Signed-off-by: Raul Gutierrez S <rgs@itevenworks.net>