Harden queries for undefined age