100% coverage again - including query implementation