Improve numeric CollQuery functions

Related to #779