query param moved in model, refactoring