final update with age related queries working