1. Created searchCriteria widget
2. Enhanced collapsible widget