Fixed behavior of booking list sorting

Also cleaned up legacy code