Changing the preference language to show first

- Also made some cleanup code;
- Corrected manual seach, now seems to work OK.