Plugin conflict with BuddyPress Group Tags

Hi,

WordPress: 3.8.1
BuddyPress: 1.9.2
BP Group Hierarchy: 1.4.2
BuddyPress Group Tags: 2.1 (https://www.ads-software.com/plugins/buddypress-group-tags/)

I experience similar issue as this one https://www.ads-software.com/support/topic/trouble-with-group_hierarchy_override_current_action

On every tag page (url/groups/tag/something) all AJAX calls returns 404. All other pages work fine.

Please can you take a look at this? Moreover I implemented a quick fix. Could you check if this fix does not break security? Here what I did to make AJAX calls work again:

bp-group-hierarchy-filters.php:22

if( is_admin() && ! strpos( admin_url('admin-ajax.php'), $_SERVER['REQUEST_URI'] ) ) {
		return $current_action;
	}

replaced with:

if( ( is_admin() && ! strpos( admin_url('admin-ajax.php'), $_SERVER['REQUEST_URI'] ) ) || ( (defined('DOING_AJAX') && DOING_AJAX) ) ) {
		return $current_action;
	}

bp-group-hierarchy-loader.php:146

if ( bp_is_groups_component() && empty( $this->current_group ) && bp_current_action() && ! in_array( bp_current_action(), $this->forbidden_names ) ) {
			bp_do_404();
			return;
		}

replaced with:

if ( bp_is_groups_component() && empty( $this->current_group ) && bp_current_action() && ! in_array( bp_current_action(), $this->forbidden_names ) ) {
			if( strpos( admin_url('admin-ajax.php'), $_SERVER['REQUEST_URI'] ) )
				return;
			bp_do_404();
			return;
		}

Please let me know if you have any better solution.

Krzysztof

https://www.ads-software.com/plugins/bp-group-hierarchy/