fixes tag and field queries
2.0.1