Refactored the way title a limit are retrieved from