diff --git a/app/Helpers/General.php b/app/Helpers/General.php
index 88fb2440..b9ca3ca3 100644
--- a/app/Helpers/General.php
+++ b/app/Helpers/General.php
@@ -70,7 +70,7 @@ if (! function_exists('process_datatable')) {
                 $value = $attributes['value'];
 
                 if ($attributes['type'] == 'text') {
-                    $data = $data->where($field, 'LIKE', "%${value}%");
+                    $data = $data->where($field, 'LIKE', "%{$value}%");
                 } elseif ($attributes['type'] == 'between') {
                     $date_values = explode('&', $value);
                     $date_values[0] .= " 00:00:00";
@@ -89,7 +89,7 @@ if (! function_exists('process_datatable')) {
                         }
                     });
                 } elseif ($attributes['type'] == 'select') {
-                    $data = $data->where($field, "${value}");
+                    $data = $data->where($field, "{$value}");
                 }
 
                 // following types have been added for making finance table serverside.
diff --git a/tests/Feature/Services/NominatimTest.php b/tests/Feature/Services/NominatimTest.php
index 8fc7fcd5..668df8c2 100644
--- a/tests/Feature/Services/NominatimTest.php
+++ b/tests/Feature/Services/NominatimTest.php
@@ -17,6 +17,6 @@ class NominatimTest extends TestCase
     {
         $wayId = (new NominatimService())->get_way_id_from_nominatim();
 
-        $this->assertEquals($wayId, 0);
+        $this->assertEquals(0, $wayId);
     }
 }