Modified ebookers search to always use multi-segment search. This made the code much simpler. Updated all tests.