Fix not num query
Merge branch 'next' into dev