Fixes for search from Polaroid