added fussy search