bugs / search improvments