code cleanup and support for types,sorting,filtering
0.19.0