Does this cover all https://zeppelin-project.atlassian.net/browse/ZEPPELIN-106 ?
Looks like the query there is different from this one