Fixed some issues and added search features