diff --git a/application/controllers/Oqrs.php b/application/controllers/Oqrs.php
index 4a7aeeb8b..fde96ff9f 100644
--- a/application/controllers/Oqrs.php
+++ b/application/controllers/Oqrs.php
@@ -36,16 +36,23 @@ class Oqrs extends CI_Controller {
 	public function index($public_slug = NULL) {
 		$this->load->model('oqrs_model');
 		$this->load->model('publicsearch');
+		$this->load->model('user_options_model');
 
-       	$slug = $this->security->xss_clean($public_slug);
+		if ($public_slug === NULL) {
+			return;
+		}
+
+		$slug = $this->security->xss_clean($public_slug);
 		$data['slug'] = $slug;
+		$data['userid'] = $this->publicsearch->get_userid_for_slug($slug);
 		$data['oqrs_enabled'] = $this->oqrs_model->oqrs_enabled($slug);
 		$data['public_search_enabled'] = $this->publicsearch->public_search_enabled($slug);
 		$data['disable_oqrs'] = $this->config->item('disable_oqrs');
 		$data['stations'] = $this->oqrs_model->get_oqrs_stations();
 		$data['page_title'] = __("Log Search & OQRS");
-		$data['global_oqrs_text'] = $this->optionslib->get_option('global_oqrs_text');
-		$data['groupedSearch'] = $this->optionslib->get_option('groupedSearch');
+		$data['global_oqrs_text'] = $this->user_options_model->get_options('oqrs',array('option_name'=>'global_oqrs_text','option_key'=>'text'))->row()->option_value;
+		$data['groupedSearch'] = $this->user_options_model->get_options('oqrs',array('option_name'=>'oqrs_grouped_search','option_key'=>'boolean'), $data['userid'])->row()->option_value;
+		$data['groupedSearchShowStationName'] = $this->user_options_model->get_options('oqrs',array('option_name'=>'oqrs_grouped_search_show_station_name','option_key'=>'boolean'), $data['userid'])->row()->option_value;
 
 		$this->load->view('visitor/layout/header', $data);
 		$this->load->view('oqrs/index');
@@ -199,9 +206,9 @@ class Oqrs extends CI_Controller {
 			$this->load->model('user_model');
 
 			$email = $this->user_model->get_email_address($id);
-			
+
 			$this->load->model('oqrs_model');
-			
+
 			$sendEmail = $this->oqrs_model->getOqrsEmailSetting($id);
 
 			if($email != "" && $sendEmail == "1") {