refactor pricing null = free, fix paging