reworked url term parsing