Solution for context blocking

Solution for context blocking when using different repositories in the
same controller