Change default query keys, resolves #462