Fixed VS filters that broke in the merge