added more underscore functions to query