Search box modification, not completely fixed yet. #64