Better default query handling.