fix search and add expandable drawer