making it compatible to 2.3 and making search collapsible