Fix for special characters in search, UI tweaking