little improvements + special chars in search