searching fixes.