A few searchability enhancements