removed dupes, organized filters