moved custom queries to repository classes