fix #15 adding url expression handling