Upgrade the default query fn
0.2.5