change basequery class