Updated field filter logic - can now exclude subclass fields (#443)