some simplifications: no shadowing and no top, bot
ensure that all queries terminate in tests
added selections!