Merge pull request #1 from CompanyBook/feature/query_based_on_live

Feature/query based on live