KM-438 allow non sql fields
KM-438 simplify filter functions
fix misplaced function
Merge pull request #64 from kodify/KM-438

Km 438