More work on visible and search stuff