Added remote search as well