generic browser - fixes of expand/collapse