refactored and keyword pagination