qsim fixes and search tweaks.