Change return type of repository custom queries to Set