Miscellaneous search profiling fixes