100% agreement, the current party search function needs to be scrapped and redone.