Inconsistent functionality

Other Hotelbird issues: