Filter fixes, disabling preloading for now