Fixed n+1 queries, added validation for the status