Lots of little fixes but mainly this brings in much better performance fixes for pulling all of the data when searching