Added searching, changed url scheme