fixed query and selections