more mods to support complex queries