Removed filter dependancy