Handle filters and field plucks in distinct queries

Closes #48
Follow on links with order and filters