#14438 Cleaned partials code, moved queries for roles from instance methods to associations