Search Setup Bug Fix