Enhances find functions and fixes various bugs linked to it