Cleaned up search logging and paging