Add fields handlers to make db filtering more customizable