Now it doesn't fire the query to fetch one record additionally