More clean-up in queries (Issue #12)