Added filtering on fields copied