Feature/rebase with bug fixes

Just merging last bug fixes into our `Relevance Score for Spotlight 7`