added entire shift + improvements for search bar