category filter dropdown not checking category status - v1.3.9h

The category filter drop down includes disabled categories.
I see this on category pages of the form:
Code:
http://example.com/main_page=index&manufacturers_id=<nnnn>
The SQL getting the categories appears to be defined in "includes/index_filters/default_filter.php".
Adding "and c.categories_status = 1" at line 155 seems to fix this.
Similarly with the other filter files too:
Code:
	music_genre_filter.php
	record_company_filter.php
Here's my attempt at a patch for default_filter.php:
Code:
--- a/includes/index_filters/default_filter.php
+++ b/includes/index_filters/default_filter.php
@@ -152,6 +152,7 @@ if (isset($_GET['alpha_filter_id']) && (int)$_GET['alpha_filter_id'] > 0) {
         and p2c.categories_id = cd.categories_id
         and cd.language_id = '" . (int)$_SESSION['languages_id'] . "'
         and p.manufacturers_id = '" . (int)$_GET['manufacturers_id'] . "'
+	and c.categories_status = 1
       order by cd.categories_name";
     } else {
       $filterlist_sql= "select distinct m.manufacturers_id as id, m.manufacturers_name as name