Added filter and enhanced text