Feature/query based on live