Added "FAST_SEARCH_ENABLED" speed improvement (0.11 per succ photo to 0.10 per succ photo). Set FAST_SEARCH_ENABLED define to enable it. minor refactoring.