working fixing no matches issue