paging on org search
code minor cleanup