current_url, form2 improvements