Fix thumbnail use and logical OR when searching