Changed query to return multiple values