Simplify Query
Fix typo
Cleanup exception handlers
Prepate v0.4.0