fixed searches; final commit (hopefully)