Performance fix, don't re-calculate the query

If you re-query same model, you won't have new fields!