Fixed scope issue with filtering new data