got rid of pagnation
fixed merge conflict in search