refactor DataTabulator for better code reuse
add post query filtering of data