Fix Albums and Groups controller