Update (F5) for more result - range safety gaurd