Added all filtering functionality.