Senate approves short-term surveillance law extension through April 30 as negotiations continue