Trying to fix focus and type search lockup issues