Added return true and minor pagination update