Implement search input #5 and tidy other inputs