BUG FIX: Critical Issue - search - space characters trimmed.