Making the code more consistent and the filters in str, int e monetary are OK