Fixed Home bug and Search bug