Find functionality fixes