Changed the way finding user in get matches