Fixed an issue with Drawer and added search functionality.