first part of filterByField refactoring done