That should fix the incrementing search on initial entry when it shouldn't increment problem