Updated tab stops and search criteria