improved some of the filter keywords