Orders management. Changed field positions and implemented 'Search By' fields logic