Improve custom_url() helper with $query and $fragment