Fix content based search based on SURF, and option to switch between histogram and SURF for search.