Parser modified, added valid url checking