added changes for problem with observation filtering