Fix some find mode bugs / updated manifest to 1.2.40