Coverage and search improvments