cleanup
fix query