first stab at query better support
remove/sort usings