Search engine fixes, comments added