fixing slightly different searches for baskets and index
remove do_sort_and_paginate
pull
rearranged
minor improvements