Some renaming, added new filter activity