Fixed find() issue with option merging