Minor changing and js for find farmer