Feature/additional information and search functionality