refactored url query composer