Added the ability to override the keys only queries.