Improved search and scoring of results