more query atom expansions for Issue #183