-Search area fixes.
-Few others fixes