diff --git a/web/themes/asc_bootstrap_bux/asc_bootstrap_bux.theme b/web/themes/asc_bootstrap_bux/asc_bootstrap_bux.theme
index 3d7d9b3a63192eda67bc9d52184eb2241539a48d..332c6d70a83eafb1e0a1ea7ac6c6631a331e7fa8 100755
--- a/web/themes/asc_bootstrap_bux/asc_bootstrap_bux.theme
+++ b/web/themes/asc_bootstrap_bux/asc_bootstrap_bux.theme
@@ -383,7 +383,8 @@ function asc_bootstrap_bux_form_alter(&$form, \Drupal\Core\Form\FormStateInterfa
 
   //events
   if (($form['#id'] == 'views-exposed-form-events-page-1')
-  ||($form['#id'] == 'views-exposed-form-events-page-3')) {
+    || ($form['#id'] == 'views-exposed-form-events-page-3')
+  ) {
     if (count($form['field_evt_taxonomy_target_id_1']['#options']) == 1) {
       $form['field_evt_taxonomy_target_id_1']['#access'] = FALSE;
     }
@@ -610,9 +611,8 @@ function asc_bootstrap_bux_form_alter(&$form, \Drupal\Core\Form\FormStateInterfa
     }
 
     //sets form action to be custom uri - on form reset
-    $refer = strtok($_SERVER['HTTP_REFERER'], '?');
-    $result = parse_url($refer, -1);
-
+    $current_path = \Drupal::service('path.current')->getPath();
+    $result = parse_url($current_path);
     $form['#action'] = $result['path'];
   }
 
@@ -682,8 +682,8 @@ function asc_bootstrap_bux_form_alter(&$form, \Drupal\Core\Form\FormStateInterfa
     }
 
     //sets form action to be custom uri - on form reset
-    $refer = strtok($_SERVER['HTTP_REFERER'], '?');
-    $result = parse_url($refer, -1);
+    $current_path = \Drupal::service('path.current')->getPath();
+    $result = parse_url($current_path);
 
     $form['#action'] = $result['path'];
   }
@@ -975,9 +975,9 @@ function asc_bootstrap_bux_views_pre_render(\Drupal\views\ViewExecutable $view)
       //changes text in header results if url parameter does not exist
       $view->header['result']->options['content'] = '@total Programs<br/><br/>';
     } else {
-    ///////////////////////////////////////////////////////////////
-    //if URL parameters are present
-    ///////////////////////////////////////////////////////////////
+      ///////////////////////////////////////////////////////////////
+      //if URL parameters are present
+      ///////////////////////////////////////////////////////////////
       //displays number of matched interests vs number of interests selected
       $view->field['nothing_2']->options['alter']['text'] = '<span class="dyp-interests">{{ field_ap_interest }}/' . $count . ' Interests</span>';