Implemented a new markup, added the search-by-url feature