moved search into collapsable containers