Modified URL regex and added FieldVal dependency path