updates to model to use new activeQuery