Search implementation, more fixes and builds