Minor cosmetic fix
Minor fix
Bug fixes for search (safeStringFormat should not replace all if given scalar values)