Add fields handlers to make db filtering more customizable
Merge branch 'handlers' into dev