justifed and improved search