Fixes for the filtering not happening on merging