FIX20140830: BUG repeated directory searches fixed