fixed get first query