Search completed, several bugs fixed