refactoring and added filter by numeric