Solved small issue when no matches were found